Commit 5d6a0f4d authored Aug 14, 2022 by Linus Torvalds

Merge tag 'for-linus-6.0-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull more xen updates from Juergen Gross:

 - fix the handling of the "persistent grants" feature negotiation
   between Xen blkfront and Xen blkback drivers

 - a cleanup of xen.config and adding xen.config to Xen section in
   MAINTAINERS

 - support HVMOP_set_evtchn_upcall_vector, which is more compliant to
   "normal" interrupt handling than the global callback used up to now

 - further small cleanups

* tag 'for-linus-6.0-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  MAINTAINERS: add xen config fragments to XEN HYPERVISOR sections
  xen: remove XEN_SCRUB_PAGES in xen.config
  xen/pciback: Fix comment typo
  xen/xenbus: fix return type in xenbus_file_read()
  xen-blkfront: Apply 'feature_persistent' parameter when connect
  xen-blkback: Apply 'feature_persistent' parameter when connect
  xen-blkback: fix persistent grants negotiation
  x86/xen: Add support for HVMOP_set_evtchn_upcall_vector

parents 96f86ff0 5ad3134d

Documentation/ABI/testing/sysfs-driver-xen-blkback

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,5 +42,5 @@ KernelVersion: 5.10
		Contact: Maximilian Heyne <mheyne@amazon.de>
		Description:
		Whether to enable the persistent grants feature or not. Note
		that this option only takes effect on newly created backends.
		that this option only takes effect on newly connected backends.
		The default is Y (enable).

Documentation/ABI/testing/sysfs-driver-xen-blkfront

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,5 +15,5 @@ KernelVersion: 5.10
		Contact: Maximilian Heyne <mheyne@amazon.de>
		Description:
		Whether to enable the persistent grants feature or not. Note
		that this option only takes effect on newly created frontends.
		that this option only takes effect on newly connected frontends.
		The default is Y (enable).

MAINTAINERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -22200,12 +22200,14 @@ F: drivers//xen-front.c
		F: drivers/xen/
		F: include/uapi/xen/
		F: include/xen/
		F: kernel/configs/xen.config

		XEN HYPERVISOR X86
		M: Juergen Gross <jgross@suse.com>
		R: Boris Ostrovsky <boris.ostrovsky@oracle.com>
		L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
		S: Supported
		F: arch/x86/configs/xen.config
		F: arch/x86/include/asm/pvclock-abi.h
		F: arch/x86/include/asm/xen/
		F: arch/x86/platform/pvh/

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,8 @@
		* ID field from 8 to 15 bits, allowing to target APIC IDs up 32768.
		*/
		#define XEN_HVM_CPUID_EXT_DEST_ID (1u << 5)
		/* Per-vCPU event channel upcalls */
		#define XEN_HVM_CPUID_UPCALL_VECTOR (1u << 6)

		/*
		* Leaf 6 (0x40000x05)

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ static inline int xen_irqs_disabled(struct pt_regs *regs)
		/* No need for a barrier -- XCHG is a barrier on x86. */
		#define xchg_xen_ulong(ptr, val) xchg((ptr), (val))

		extern int xen_have_vector_callback;
		extern bool xen_have_vector_callback;

		/*
		* Events delivered via platform PCI interrupts are always
		@@ -34,4 +34,5 @@ static inline bool xen_support_evtchn_rebind(void)
		return (!xen_hvm_domain() \|\| xen_have_vector_callback);
		}

		extern bool xen_percpu_upcall;
		#endif /* _ASM_X86_XEN_EVENTS_H */