Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abacaadc authored by David Vrabel's avatar David Vrabel
Browse files

x86/xen: fix memory setup for PVH dom0 



Since af06d66ee32b (x86: fix setup of PVH Dom0 memory map) in Xen, PVH
dom0 need only use the memory memory provided by Xen which has already
setup all the correct holes.

xen_memory_setup() then ends up being trivial for a PVH guest so
introduce a new function (xen_auto_xlated_memory_setup()).

Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Acked-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Tested-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
parent 77945ca7

arch/x86/xen/enlighten.c

+4 −1
Original line number Diff line number Diff line
@@ -1537,6 +1537,9 @@ asmlinkage void __init xen_start_kernel(void) 
	if (!xen_pvh_domain())

		pv_cpu_ops = xen_cpu_ops;



	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.banner = xen_banner;

arch/x86/xen/setup.c

+29 −0
Original line number Diff line number Diff line
@@ -517,6 +517,35 @@ char * __init xen_memory_setup(void) 
	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.

 * We only need to bother in pure 32-bit mode; compat 32-bit processes

arch/x86/xen/xen-ops.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ void xen_mm_unpin_all(void); 
void xen_set_pat(u64);



char * __init xen_memory_setup(void);

char * xen_auto_xlated_memory_setup(void);

void __init xen_arch_setup(void);

void xen_enable_sysenter(void);

void xen_enable_syscall(void);