Commit 3d09c623 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull Xen fixes from David Vrabel:
 "Xen regression and PVH fixes for 3.16-rc1

   - fix dom0 PVH memory setup on latest unstable Xen releases
   - fix 64-bit x86 PV guest boot failure on Xen 3.1 and earlier
   - fix resume regression on non-PV (auto-translated physmap) guests"

* tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/grant-table: fix suspend for non-PV guests
  x86/xen: no need to explicitly register an NMI callback
  Revert "xen/pvh: Update E820 to work with PVH (v2)"
  x86/xen: fix memory setup for PVH dom0
parents 92b94417 13cd36a3
...@@ -1537,7 +1537,10 @@ asmlinkage __visible void __init xen_start_kernel(void) ...@@ -1537,7 +1537,10 @@ asmlinkage __visible void __init xen_start_kernel(void)
if (!xen_pvh_domain()) if (!xen_pvh_domain())
pv_cpu_ops = xen_cpu_ops; pv_cpu_ops = xen_cpu_ops;
x86_init.resources.memory_setup = xen_memory_setup; if (xen_feature(XENFEAT_auto_translated_physmap))
x86_init.resources.memory_setup = xen_auto_xlated_memory_setup;
else
x86_init.resources.memory_setup = xen_memory_setup;
x86_init.oem.arch_setup = xen_arch_setup; x86_init.oem.arch_setup = xen_arch_setup;
x86_init.oem.banner = xen_banner; x86_init.oem.banner = xen_banner;
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <xen/interface/memory.h> #include <xen/interface/memory.h>
#include <xen/interface/physdev.h> #include <xen/interface/physdev.h>
#include <xen/features.h> #include <xen/features.h>
#include "mmu.h"
#include "xen-ops.h" #include "xen-ops.h"
#include "vdso.h" #include "vdso.h"
...@@ -82,9 +81,6 @@ static void __init xen_add_extra_mem(u64 start, u64 size) ...@@ -82,9 +81,6 @@ static void __init xen_add_extra_mem(u64 start, u64 size)
memblock_reserve(start, size); memblock_reserve(start, size);
if (xen_feature(XENFEAT_auto_translated_physmap))
return;
xen_max_p2m_pfn = PFN_DOWN(start + size); xen_max_p2m_pfn = PFN_DOWN(start + size);
for (pfn = PFN_DOWN(start); pfn < xen_max_p2m_pfn; pfn++) { for (pfn = PFN_DOWN(start); pfn < xen_max_p2m_pfn; pfn++) {
unsigned long mfn = pfn_to_mfn(pfn); unsigned long mfn = pfn_to_mfn(pfn);
...@@ -107,7 +103,6 @@ static unsigned long __init xen_do_chunk(unsigned long start, ...@@ -107,7 +103,6 @@ static unsigned long __init xen_do_chunk(unsigned long start,
.domid = DOMID_SELF .domid = DOMID_SELF
}; };
unsigned long len = 0; unsigned long len = 0;
int xlated_phys = xen_feature(XENFEAT_auto_translated_physmap);
unsigned long pfn; unsigned long pfn;
int ret; int ret;
...@@ -121,7 +116,7 @@ static unsigned long __init xen_do_chunk(unsigned long start, ...@@ -121,7 +116,7 @@ static unsigned long __init xen_do_chunk(unsigned long start,
continue; continue;
frame = mfn; frame = mfn;
} else { } else {
if (!xlated_phys && mfn != INVALID_P2M_ENTRY) if (mfn != INVALID_P2M_ENTRY)
continue; continue;
frame = pfn; frame = pfn;
} }
...@@ -159,13 +154,6 @@ static unsigned long __init xen_do_chunk(unsigned long start, ...@@ -159,13 +154,6 @@ static unsigned long __init xen_do_chunk(unsigned long start,
static unsigned long __init xen_release_chunk(unsigned long start, static unsigned long __init xen_release_chunk(unsigned long start,
unsigned long end) unsigned long end)
{ {
/*
* Xen already ballooned out the E820 non RAM regions for us
* and set them up properly in EPT.
*/
if (xen_feature(XENFEAT_auto_translated_physmap))
return end - start;
return xen_do_chunk(start, end, true); return xen_do_chunk(start, end, true);
} }
...@@ -234,13 +222,7 @@ static void __init xen_set_identity_and_release_chunk( ...@@ -234,13 +222,7 @@ static void __init xen_set_identity_and_release_chunk(
* (except for the ISA region which must be 1:1 mapped) to * (except for the ISA region which must be 1:1 mapped) to
* release the refcounts (in Xen) on the original frames. * release the refcounts (in Xen) on the original frames.
*/ */
for (pfn = start_pfn; pfn <= max_pfn_mapped && pfn < end_pfn; pfn++) {
/*
* PVH E820 matches the hypervisor's P2M which means we need to
* account for the proper values of *release and *identity.
*/
for (pfn = start_pfn; !xen_feature(XENFEAT_auto_translated_physmap) &&
pfn <= max_pfn_mapped && pfn < end_pfn; pfn++) {
pte_t pte = __pte_ma(0); pte_t pte = __pte_ma(0);
if (pfn < PFN_UP(ISA_END_ADDRESS)) if (pfn < PFN_UP(ISA_END_ADDRESS))
...@@ -517,6 +499,35 @@ char * __init xen_memory_setup(void) ...@@ -517,6 +499,35 @@ char * __init xen_memory_setup(void)
return "Xen"; return "Xen";
} }
/*
* Machine specific memory setup for auto-translated guests.
*/
char * __init xen_auto_xlated_memory_setup(void)
{
static struct e820entry map[E820MAX] __initdata;
struct xen_memory_map memmap;
int i;
int rc;
memmap.nr_entries = E820MAX;
set_xen_guest_handle(memmap.buffer, map);
rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
if (rc < 0)
panic("No memory map (%d)\n", rc);
sanitize_e820_map(map, ARRAY_SIZE(map), &memmap.nr_entries);
for (i = 0; i < memmap.nr_entries; i++)
e820_add_region(map[i].addr, map[i].size, map[i].type);
memblock_reserve(__pa(xen_start_info->mfn_list),
xen_start_info->pt_base - xen_start_info->mfn_list);
return "Xen";
}
/* /*
* Set the bit indicating "nosegneg" library variants should be used. * Set the bit indicating "nosegneg" library variants should be used.
* We only need to bother in pure 32-bit mode; compat 32-bit processes * We only need to bother in pure 32-bit mode; compat 32-bit processes
...@@ -590,13 +601,7 @@ void xen_enable_syscall(void) ...@@ -590,13 +601,7 @@ void xen_enable_syscall(void)
} }
#endif /* CONFIG_X86_64 */ #endif /* CONFIG_X86_64 */
} }
void xen_enable_nmi(void)
{
#ifdef CONFIG_X86_64
if (register_callback(CALLBACKTYPE_nmi, (char *)nmi))
BUG();
#endif
}
void __init xen_pvmmu_arch_setup(void) void __init xen_pvmmu_arch_setup(void)
{ {
HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments); HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments);
...@@ -611,7 +616,6 @@ void __init xen_pvmmu_arch_setup(void) ...@@ -611,7 +616,6 @@ void __init xen_pvmmu_arch_setup(void)
xen_enable_sysenter(); xen_enable_sysenter();
xen_enable_syscall(); xen_enable_syscall();
xen_enable_nmi();
} }
/* This function is not called for HVM domains */ /* This function is not called for HVM domains */
......
...@@ -36,6 +36,7 @@ void xen_mm_unpin_all(void); ...@@ -36,6 +36,7 @@ void xen_mm_unpin_all(void);
void xen_set_pat(u64); void xen_set_pat(u64);
char * __init xen_memory_setup(void); char * __init xen_memory_setup(void);
char * xen_auto_xlated_memory_setup(void);
void __init xen_arch_setup(void); void __init xen_arch_setup(void);
void xen_enable_sysenter(void); void xen_enable_sysenter(void);
void xen_enable_syscall(void); void xen_enable_syscall(void);
......
...@@ -1168,7 +1168,8 @@ int gnttab_resume(void) ...@@ -1168,7 +1168,8 @@ int gnttab_resume(void)
int gnttab_suspend(void) int gnttab_suspend(void)
{ {
gnttab_interface->unmap_frames(); if (!xen_feature(XENFEAT_auto_translated_physmap))
gnttab_interface->unmap_frames();
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment