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

Commit 0e9e3e30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.7-rc2-tag' of... 

Merge tag 'stable/for-linus-3.7-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Pull xen bug-fixes from Konrad Rzeszutek Wilk:
 - Fix mysterious SIGSEGV or SIGKILL in applications due to corrupting
   of the %eip when returning from a signal handler.
 - Fix various ARM compile issues after the merge fallout.
 - Continue on making more of the Xen generic code usable by ARM
   platform.
 - Fix SR-IOV passthrough to mirror multifunction PCI devices.
 - Fix various compile warnings.
 - Remove hypercalls that don't exist anymore.

* tag 'stable/for-linus-3.7-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: dbgp: Fix warning when CONFIG_PCI is not enabled.
  xen: arm: comment on why 64-bit xen_pfn_t is safe even on 32 bit
  xen: balloon: use correct type for frame_list
  xen/x86: don't corrupt %eip when returning from a signal handler
  xen: arm: make p2m operations NOPs
  xen: balloon: don't include e820.h
  xen: grant: use xen_pfn_t type for frame_list.
  xen: events: pirq_check_eoi_map is X86 specific
  xen: XENMEM_translate_gpfn_list was remove ages ago and is unused.
  xen: sysfs: fix build warning.
  xen: sysfs: include err.h for PTR_ERR etc
  xen: xenbus: quirk uses x86 specific cpuid
  xen PV passthru: assign SR-IOV virtual functions to separate virtual slots
  xen/xenbus: Fix compile warning.
  xen/x86: remove duplicated include from enlighten.c
parents 3185bd26 801e7fb7

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

+9 −3
Original line number Diff line number Diff line
@@ -29,16 +29,22 @@ 


#ifndef __ASSEMBLY__

/* Explicitly size integers that represent pfns in the interface with

 * Xen so that we can have one ABI that works for 32 and 64 bit guests. */

 * Xen so that we can have one ABI that works for 32 and 64 bit guests.

 * Note that this means that the xen_pfn_t type may be capable of

 * representing pfn's which the guest cannot represent in its own pfn

 * type. However since pfn space is controlled by the guest this is

 * fine since it simply wouldn't be able to create any sure pfns in

 * the first place.

 */

typedef uint64_t xen_pfn_t;

#define PRI_xen_pfn "llx"

typedef uint64_t xen_ulong_t;

#define PRI_xen_ulong "llx"

/* Guest handles for primitive C types. */

__DEFINE_GUEST_HANDLE(uchar, unsigned char);

__DEFINE_GUEST_HANDLE(uint,  unsigned int);

__DEFINE_GUEST_HANDLE(ulong, unsigned long);

DEFINE_GUEST_HANDLE(char);

DEFINE_GUEST_HANDLE(int);

DEFINE_GUEST_HANDLE(long);

DEFINE_GUEST_HANDLE(void);

DEFINE_GUEST_HANDLE(uint64_t);

DEFINE_GUEST_HANDLE(uint32_t);

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

+10 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <xen/interface/grant_table.h>



#define pfn_to_mfn(pfn)			(pfn)

#define phys_to_machine_mapping_valid	(1)

#define phys_to_machine_mapping_valid(pfn) (1)

#define mfn_to_pfn(mfn)			(mfn)

#define mfn_to_virt(m)			(__va(mfn_to_pfn(m) << PAGE_SHIFT))
@@ -30,6 +30,8 @@ typedef struct xpaddr { 
#define XMADDR(x)	((xmaddr_t) { .maddr = (x) })

#define XPADDR(x)	((xpaddr_t) { .paddr = (x) })



#define INVALID_P2M_ENTRY      (~0UL)



static inline xmaddr_t phys_to_machine(xpaddr_t phys)

{

	unsigned offset = phys.paddr & ~PAGE_MASK;
@@ -74,9 +76,14 @@ static inline int m2p_remove_override(struct page *page, bool clear_pte) 
	return 0;

}



static inline bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn)

{

	BUG_ON(pfn != mfn && mfn != INVALID_P2M_ENTRY);

	return true;

}



static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn)

{

	BUG();

	return false;

	return __set_phys_to_machine(pfn, mfn);

}

#endif /* _ASM_ARM_XEN_PAGE_H */

arch/arm/xen/grant-table.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <xen/page.h>

#include <xen/grant_table.h>



int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,

int arch_gnttab_map_shared(xen_pfn_t *frames, unsigned long nr_gframes,

			   unsigned long max_nr_gframes,

			   void **__shared)

{

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

+2 −2
Original line number Diff line number Diff line
@@ -51,14 +51,14 @@ 
 * with Xen so that on ARM we can have one ABI that works for 32 and 64

 * bit guests. */

typedef unsigned long xen_pfn_t;

#define PRI_xen_pfn "lx"

typedef unsigned long xen_ulong_t;

#define PRI_xen_ulong "lx"

/* Guest handles for primitive C types. */

__DEFINE_GUEST_HANDLE(uchar, unsigned char);

__DEFINE_GUEST_HANDLE(uint,  unsigned int);

__DEFINE_GUEST_HANDLE(ulong, unsigned long);

DEFINE_GUEST_HANDLE(char);

DEFINE_GUEST_HANDLE(int);

DEFINE_GUEST_HANDLE(long);

DEFINE_GUEST_HANDLE(void);

DEFINE_GUEST_HANDLE(uint64_t);

DEFINE_GUEST_HANDLE(uint32_t);

arch/x86/kernel/entry_32.S

+5 −3
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ ENTRY(xen_sysenter_target) 


ENTRY(xen_hypervisor_callback)

	CFI_STARTPROC

	pushl_cfi $0

	pushl_cfi $-1 /* orig_ax = -1 => not a system call */

	SAVE_ALL

	TRACE_IRQS_OFF
@@ -1077,14 +1077,16 @@ ENTRY(xen_failsafe_callback) 
2:	mov 8(%esp),%es

3:	mov 12(%esp),%fs

4:	mov 16(%esp),%gs

	/* EAX == 0 => Category 1 (Bad segment)

	   EAX != 0 => Category 2 (Bad IRET) */

	testl %eax,%eax

	popl_cfi %eax

	lea 16(%esp),%esp

	CFI_ADJUST_CFA_OFFSET -16

	jz 5f

	addl $16,%esp

	jmp iret_exc		# EAX != 0 => Category 2 (Bad IRET)

5:	pushl_cfi $0		# EAX == 0 => Category 1 (Bad segment)

	jmp iret_exc

5:	pushl_cfi $-1 /* orig_ax = -1 => not a system call */

	SAVE_ALL

	jmp ret_from_exception

	CFI_ENDPROC