Commit 3872f516 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more xen updates from Juergen Gross:
 "Some minor cleanup patches and a small series disentangling some Xen
  related Kconfig options"

* tag 'for-linus-5.11-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: Kconfig: remove X86_64 depends from XEN_512GB
  xen/manage: Fix fall-through warnings for Clang
  xen-blkfront: Fix fall-through warnings for Clang
  xen: remove trailing semicolon in macro definition
  xen: Kconfig: nest Xen guest options
  xen: Remove Xen PVH/PVHVM dependency on PCI
  x86/xen: Convert to DEFINE_SHOW_ATTRIBUTE
parents 651283d5 6190c0cc

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

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ unsigned long arbitrary_virt_to_mfn(void *vaddr); 
void make_lowmem_page_readonly(void *vaddr);

void make_lowmem_page_readwrite(void *vaddr);



#define xen_remap(cookie, size) ioremap((cookie), (size));

#define xen_remap(cookie, size) ioremap((cookie), (size))

#define xen_unmap(cookie) iounmap((cookie))



static inline bool xen_arch_need_swiotlb(struct device *dev,

arch/x86/xen/Kconfig

+22 −16
Original line number Diff line number Diff line
@@ -26,6 +26,19 @@ config XEN_PV 
	help

	  Support running as a Xen PV guest.



config XEN_512GB

	bool "Limit Xen pv-domain memory to 512GB"

	depends on XEN_PV

	default y

	help

	  Limit paravirtualized user domains to 512GB of RAM.



	  The Xen tools and crash dump analysis tools might not support

	  pv-domains with more than 512 GB of RAM. This option controls the

	  default setting of the kernel to use only up to 512 GB or more.

	  It is always possible to change the default via specifying the

	  boot parameter "xen_512gb_limit".



config XEN_PV_SMP

	def_bool y

	depends on XEN_PV && SMP
@@ -39,28 +52,19 @@ config XEN_DOM0 
	  Support running as a Xen PV Dom0 guest.



config XEN_PVHVM

	bool "Xen PVHVM guest support"

	default y

	depends on XEN && PCI && X86_LOCAL_APIC

	help

	  Support running as a Xen PVHVM guest.

	def_bool y

	depends on XEN && X86_LOCAL_APIC



config XEN_PVHVM_SMP

	def_bool y

	depends on XEN_PVHVM && SMP



config XEN_512GB

	bool "Limit Xen pv-domain memory to 512GB"

	depends on XEN_PV

config XEN_PVHVM_GUEST

	bool "Xen PVHVM guest support"

	default y

	depends on XEN_PVHVM && PCI

	help

	  Limit paravirtualized user domains to 512GB of RAM.



	  The Xen tools and crash dump analysis tools might not support

	  pv-domains with more than 512 GB of RAM. This option controls the

	  default setting of the kernel to use only up to 512 GB or more.

	  It is always possible to change the default via specifying the

	  boot parameter "xen_512gb_limit".

	  Support running as a Xen PVHVM guest.



config XEN_SAVE_RESTORE

	bool
@@ -76,7 +80,9 @@ config XEN_DEBUG_FS 
	  Enabling this option may incur a significant performance overhead.



config XEN_PVH

	bool "Support for running as a Xen PVH guest"

	bool "Xen PVH guest support"

	depends on XEN && XEN_PVHVM && ACPI

	select PVH

	def_bool n

	help

	  Support for running as a Xen PVH guest.

arch/x86/xen/p2m.c

+1 −11
Original line number Diff line number Diff line
@@ -795,17 +795,7 @@ static int p2m_dump_show(struct seq_file *m, void *v) 
	return 0;

}



static int p2m_dump_open(struct inode *inode, struct file *filp)

{

	return single_open(filp, p2m_dump_show, NULL);

}



static const struct file_operations p2m_dump_fops = {

	.open		= p2m_dump_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

DEFINE_SHOW_ATTRIBUTE(p2m_dump);



static struct dentry *d_mmu_debug;

drivers/block/xen-blkfront.c

+1 −0
Original line number Diff line number Diff line
@@ -2462,6 +2462,7 @@ static void blkback_changed(struct xenbus_device *dev, 
			break;

		if (talk_to_blkback(dev, info))

			break;

		break;

	case XenbusStateInitialising:

	case XenbusStateInitialised:

	case XenbusStateReconfiguring:

drivers/xen/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o 
obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)	+= xen-gntalloc.o

obj-$(CONFIG_XENFS)			+= xenfs/

obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o

obj-$(CONFIG_XEN_PVHVM)			+= platform-pci.o

obj-$(CONFIG_XEN_PVHVM_GUEST)		+= platform-pci.o

obj-$(CONFIG_SWIOTLB_XEN)		+= swiotlb-xen.o

obj-$(CONFIG_XEN_MCE_LOG)		+= mcelog.o

obj-$(CONFIG_XEN_PCIDEV_BACKEND)	+= xen-pciback/

CRA Git | Maintained and supported by SUSTech CRA and CCSE