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

Commit a4ec046c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen 

* 'upstream/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (23 commits)
  xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs.
  xen: set IO permission early (before early_cpu_init())
  xen: re-enable boot-time ballooning
  xen/balloon: make sure we only include remaining extra ram
  xen/balloon: the balloon_lock is useless
  xen: add extra pages to balloon
  xen: make evtchn's name less generic
  xen/evtchn: the evtchn device is non-seekable
  Revert "xen/privcmd: create address space to allow writable mmaps"
  xen/events: use locked set|clear_bit() for cpu_evtchn_mask
  xen/evtchn: clear secondary CPUs' cpu_evtchn_mask[] after restore
  xen/xenfs: update xenfs_mount for new prototype
  xen: fix header export to userspace
  xen: implement XENMEM_machphys_mapping
  xen: set vma flag VM_PFNMAP in the privcmd mmap file_op
  xen: xenfs: privcmd: check put_user() return code
  xen/evtchn: add missing static
  xen/evtchn: Fix name of Xen event-channel device
  xen/evtchn: don't do unbind_from_irqhandler under spinlock
  xen/evtchn: remove spurious barrier
  ...
parents 3cbaa0f7 9b832153

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

+18 −1
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);
@@ -1090,6 +1095,8 @@ static void __init xen_setup_stackprotector(void) 
/* First C function to be called on Xen boot */

asmlinkage void __init xen_start_kernel(void)

{

	struct physdev_set_iopl set_iopl;

	int rc;

	pgd_t *pgd;



	if (!xen_start_info)
@@ -1097,6 +1104,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;
@@ -1202,10 +1211,18 @@ asmlinkage void __init xen_start_kernel(void) 
#else

	pv_info.kernel_rpl = 0;

#endif



	/* set the limit of our address space */

	xen_reserve_top();



	/* We used to do this in xen_arch_setup, but that is too late on AMD

	 * were early_cpu_init (run before ->arch_setup()) calls early_amd_init

	 * which pokes 0xcf8 port.

	 */

	set_iopl.iopl = 1;

	rc = HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl);

	if (rc != 0)

		xen_raw_printk("physdev_op failed %d\n", rc);



#ifdef CONFIG_X86_32

	/* set up basic CPUID stuff */

	cpu_detect(&new_cpu_data);