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

Commit 81ae31d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Xen updates from David Vrabel:
 "Features and fixes:

   - Add pvscsi frontend and backend drivers.
   - Remove _PAGE_IOMAP PTE flag, freeing it for alternate uses.
   - Try and keep memory contiguous during PV memory setup (reduces
     SWIOTLB usage).
   - Allow front/back drivers to use threaded irqs.
   - Support large initrds in PV guests.
   - Fix PVH guests in preparation for Xen 4.5"

* tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (22 commits)
  xen: remove DEFINE_XENBUS_DRIVER() macro
  xen/xenbus: Remove BUG_ON() when error string trucated
  xen/xenbus: Correct the comments for xenbus_grant_ring()
  x86/xen: Set EFER.NX and EFER.SCE in PVH guests
  xen: eliminate scalability issues from initrd handling
  xen: sync some headers with xen tree
  xen: make pvscsi frontend dependant on xenbus frontend
  arm{,64}/xen: Remove "EXPERIMENTAL" in the description of the Xen options
  xen-scsifront: don't deadlock if the ring becomes full
  x86: remove the Xen-specific _PAGE_IOMAP PTE flag
  x86/xen: do not use _PAGE_IOMAP PTE flag for I/O mappings
  x86: skip check for spurious faults for non-present faults
  xen/efi: Directly include needed headers
  xen-scsiback: clean up a type issue in scsiback_make_tpg()
  xen-scsifront: use GFP_ATOMIC under spin_lock
  MAINTAINERS: Add xen pvscsi maintainer
  xen-scsiback: Add Xen PV SCSI backend driver
  xen-scsifront: Add Xen PV SCSI frontend driver
  xen: Add Xen pvSCSI protocol description
  xen/events: support threaded irqs for interdomain event channels
  ...
parents ef4a48c5 95afae48

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -10268,6 +10268,15 @@ S: Supported 
F:	drivers/block/xen-blkback/*

F:	drivers/block/xen*



XEN PVSCSI DRIVERS

M:	Juergen Gross <jgross@suse.com>

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/xen-scsifront.c

F:	drivers/xen/xen-scsiback.c

F:	include/xen/interface/io/vscsiif.h



XEN SWIOTLB SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1779,7 +1779,7 @@ config XEN_DOM0 
	depends on XEN



config XEN

	bool "Xen guest support on ARM (EXPERIMENTAL)"

	bool "Xen guest support on ARM"

	depends on ARM && AEABI && OF

	depends on CPU_V7 && !CPU_V6

	depends on !GENERIC_ATOMIC64

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ config XEN_DOM0 
	depends on XEN



config XEN

	bool "Xen guest support on ARM64 (EXPERIMENTAL)"

	bool "Xen guest support on ARM64"

	depends on ARM64 && OF

	select SWIOTLB_XEN

	help

arch/x86/include/asm/pgtable_types.h

+5 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#define _PAGE_BIT_SPECIAL	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_CPA_TEST	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_SPLITTING	_PAGE_BIT_SOFTW2 /* only valid on a PSE pmd */

#define _PAGE_BIT_IOMAP		_PAGE_BIT_SOFTW2 /* flag used to indicate IO mapping */

#define _PAGE_BIT_HIDDEN	_PAGE_BIT_SOFTW3 /* hidden by kmemcheck */

#define _PAGE_BIT_SOFT_DIRTY	_PAGE_BIT_SOFTW3 /* software dirty tracking */

#define _PAGE_BIT_NX           63       /* No execute: only valid after cpuid check */
@@ -52,7 +51,7 @@ 
#define _PAGE_PSE	(_AT(pteval_t, 1) << _PAGE_BIT_PSE)

#define _PAGE_GLOBAL	(_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)

#define _PAGE_SOFTW1	(_AT(pteval_t, 1) << _PAGE_BIT_SOFTW1)

#define _PAGE_IOMAP	(_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)

#define _PAGE_SOFTW2	(_AT(pteval_t, 1) << _PAGE_BIT_SOFTW2)

#define _PAGE_PAT	(_AT(pteval_t, 1) << _PAGE_BIT_PAT)

#define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)

#define _PAGE_SPECIAL	(_AT(pteval_t, 1) << _PAGE_BIT_SPECIAL)
@@ -168,10 +167,10 @@ 
#define __PAGE_KERNEL_LARGE_NOCACHE	(__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE)

#define __PAGE_KERNEL_LARGE_EXEC	(__PAGE_KERNEL_EXEC | _PAGE_PSE)



#define __PAGE_KERNEL_IO		(__PAGE_KERNEL | _PAGE_IOMAP)

#define __PAGE_KERNEL_IO_NOCACHE	(__PAGE_KERNEL_NOCACHE | _PAGE_IOMAP)

#define __PAGE_KERNEL_IO_UC_MINUS	(__PAGE_KERNEL_UC_MINUS | _PAGE_IOMAP)

#define __PAGE_KERNEL_IO_WC		(__PAGE_KERNEL_WC | _PAGE_IOMAP)

#define __PAGE_KERNEL_IO		(__PAGE_KERNEL)

#define __PAGE_KERNEL_IO_NOCACHE	(__PAGE_KERNEL_NOCACHE)

#define __PAGE_KERNEL_IO_UC_MINUS	(__PAGE_KERNEL_UC_MINUS)

#define __PAGE_KERNEL_IO_WC		(__PAGE_KERNEL_WC)



#define PAGE_KERNEL			__pgprot(__PAGE_KERNEL)

#define PAGE_KERNEL_RO			__pgprot(__PAGE_KERNEL_RO)

arch/x86/mm/fault.c

+20 −2
Original line number Diff line number Diff line
@@ -933,8 +933,17 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte) 
 * cross-processor TLB flush, even if no stale TLB entries exist

 * on other processors.

 *

 * Spurious faults may only occur if the TLB contains an entry with

 * fewer permission than the page table entry.  Non-present (P = 0)

 * and reserved bit (R = 1) faults are never spurious.

 *

 * There are no security implications to leaving a stale TLB when

 * increasing the permissions on a page.

 *

 * Returns non-zero if a spurious fault was handled, zero otherwise.

 *

 * See Intel Developer's Manual Vol 3 Section 4.10.4.3, bullet 3

 * (Optional Invalidation).

 */

static noinline int

spurious_fault(unsigned long error_code, unsigned long address)
@@ -945,8 +954,17 @@ spurious_fault(unsigned long error_code, unsigned long address) 
	pte_t *pte;

	int ret;



	/* Reserved-bit violation or user access to kernel space? */

	if (error_code & (PF_USER | PF_RSVD))

	/*

	 * Only writes to RO or instruction fetches from NX may cause

	 * spurious faults.

	 *

	 * These could be from user or supervisor accesses but the TLB

	 * is only lazily flushed after a kernel mapping protection

	 * change, so user accesses are not expected to cause spurious

	 * faults.

	 */

	if (error_code != (PF_WRITE | PF_PROT)

	    && error_code != (PF_INSTR | PF_PROT))

		return 0;



	pgd = init_mm.pgd + pgd_index(address);