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

Commit 7e77506a authored by Ian Campbell's avatar Ian Campbell Committed by Jeremy Fitzhardinge
Browse files

xen: implement XENMEM_machphys_mapping 



This hypercall allows Xen to specify a non-default location for the
machine to physical mapping. This capability is used when running a 32
bit domain 0 on a 64 bit hypervisor to shrink the hypervisor hole to
exactly the size required.

[ Impact: add Xen hypercall definitions ]

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent 9ec23a7f

arch/x86/include/asm/xen/interface.h

+3 −3
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ DEFINE_GUEST_HANDLE(void); 
#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START)

#endif



#ifndef machine_to_phys_mapping

#define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START)

#endif

#define MACH2PHYS_VIRT_START  mk_unsigned_long(__MACH2PHYS_VIRT_START)

#define MACH2PHYS_VIRT_END    mk_unsigned_long(__MACH2PHYS_VIRT_END)

#define MACH2PHYS_NR_ENTRIES  ((MACH2PHYS_VIRT_END-MACH2PHYS_VIRT_START)>>__MACH2PHYS_SHIFT)



/* Maximum number of virtual CPUs in multi-processor guests. */

#define MAX_VIRT_CPUS 32

arch/x86/include/asm/xen/interface_32.h

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ 
/* And the trap vector is... */

#define TRAP_INSTR "int $0x82"



#define __MACH2PHYS_VIRT_START 0xF5800000

#define __MACH2PHYS_VIRT_END   0xF6800000



#define __MACH2PHYS_SHIFT      2



/*

 * Virtual addresses beyond this are not modifiable by guest OSes. The

 * machine->physical mapping table starts at this address, read-only.

arch/x86/include/asm/xen/interface_64.h

+1 −12
Original line number Diff line number Diff line
@@ -39,18 +39,7 @@ 
#define __HYPERVISOR_VIRT_END   0xFFFF880000000000

#define __MACH2PHYS_VIRT_START  0xFFFF800000000000

#define __MACH2PHYS_VIRT_END    0xFFFF804000000000



#ifndef HYPERVISOR_VIRT_START

#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START)

#define HYPERVISOR_VIRT_END   mk_unsigned_long(__HYPERVISOR_VIRT_END)

#endif



#define MACH2PHYS_VIRT_START  mk_unsigned_long(__MACH2PHYS_VIRT_START)

#define MACH2PHYS_VIRT_END    mk_unsigned_long(__MACH2PHYS_VIRT_END)

#define MACH2PHYS_NR_ENTRIES  ((MACH2PHYS_VIRT_END-MACH2PHYS_VIRT_START)>>3)

#ifndef machine_to_phys_mapping

#define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START)

#endif

#define __MACH2PHYS_SHIFT       3



/*

 * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long base)

arch/x86/include/asm/xen/page.h

+4 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/types.h>

#include <linux/spinlock.h>

#include <linux/pfn.h>

#include <linux/mm.h>



#include <asm/uaccess.h>

#include <asm/page.h>
@@ -35,6 +36,8 @@ typedef struct xpaddr { 
#define MAX_DOMAIN_PAGES						\

    ((unsigned long)((u64)CONFIG_XEN_MAX_DOMAIN_MEMORY * 1024 * 1024 * 1024 / PAGE_SIZE))



extern unsigned long *machine_to_phys_mapping;

extern unsigned int   machine_to_phys_order;



extern unsigned long get_phys_to_machine(unsigned long pfn);

extern bool set_phys_to_machine(unsigned long pfn, unsigned long mfn);
@@ -69,10 +72,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) 
	if (xen_feature(XENFEAT_auto_translated_physmap))

		return mfn;



#if 0

	if (unlikely((mfn >> machine_to_phys_order) != 0))

		return max_mapnr;

#endif

		return ~0;



	pfn = 0;

	/*

arch/x86/xen/enlighten.c

+7 −0
Original line number Diff line number Diff line
@@ -75,6 +75,11 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info); 
enum xen_domain_type xen_domain_type = XEN_NATIVE;

EXPORT_SYMBOL_GPL(xen_domain_type);



unsigned long *machine_to_phys_mapping = (void *)MACH2PHYS_VIRT_START;

EXPORT_SYMBOL(machine_to_phys_mapping);

unsigned int   machine_to_phys_order;

EXPORT_SYMBOL(machine_to_phys_order);



struct start_info *xen_start_info;

EXPORT_SYMBOL_GPL(xen_start_info);
@@ -1097,6 +1102,8 @@ asmlinkage void __init xen_start_kernel(void) 


	xen_domain_type = XEN_PV_DOMAIN;



	xen_setup_machphys_mapping();



	/* Install Xen paravirt ops */

	pv_info = xen_info;

	pv_init_ops = xen_init_ops;