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

Merge tag 'for-linus-5.8b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:

 - several smaller cleanups

 - a fix for a Xen guest regression with CPU offlining

 - a small fix in the xen pvcalls backend driver

 - an update of MAINTAINERS

* tag 'for-linus-5.8b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  MAINTAINERS: Update PARAVIRT_OPS_INTERFACE and VMWARE_HYPERVISOR_INTERFACE
  xen/pci: Get rid of verbose_request and use dev_dbg() instead
  xenbus: Use dev_printk() when possible
  xen-pciback: Use dev_printk() when possible
  xen: enable BALLOON_MEMORY_HOTPLUG by default
  xen: expand BALLOON_MEMORY_HOTPLUG description
  xen/pvcalls: Make pvcalls_back_global static
  xen/cpuhotplug: Fix initial CPU offlining for PV(H) guests
  xen-platform: Constify dev_pm_ops
  xen/pvcalls-back: test for errors when calling backend_connect()
parents b791d1bd a952f64d

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -12911,7 +12911,7 @@ F: include/uapi/linux/ppdev.h 














PARAVIRT_OPS INTERFACE















M:	Juergen Gross <jgross@suse.com>













M:	Thomas Hellstrom <thellstrom@vmware.com>













M:	Deep Shah <sdeep@vmware.com>















M:	"VMware, Inc." <pv-drivers@vmware.com>















L:	virtualization@lists.linux-foundation.org















S:	Supported










@@ -18287,7 +18287,7 @@ S:	Maintained













F:	drivers/misc/vmw_balloon.c





























VMWARE HYPERVISOR INTERFACE













M:	Thomas Hellstrom <thellstrom@vmware.com>













M:	Deep Shah <sdeep@vmware.com>















M:	"VMware, Inc." <pv-drivers@vmware.com>















L:	virtualization@lists.linux-foundation.org















S:	Supported

























drivers/pci/xen-pcifront.c



+10
−17






























Original line number
Diff line number
Diff line








@@ -77,9 +77,6 @@ static inline void pcifront_init_sd(struct pcifront_sd *sd,













static DEFINE_SPINLOCK(pcifront_dev_lock);















static struct pcifront_device *pcifront_dev;





























static int verbose_request;













module_param(verbose_request, int, 0644);





























static int errno_to_pcibios_err(int errno)















{















	switch (errno) {










@@ -190,8 +187,7 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,













	struct pcifront_sd *sd = bus->sysdata;















	struct pcifront_device *pdev = pcifront_get_pdev(sd);





























	if (verbose_request)













		dev_info(&pdev->xdev->dev,













	dev_dbg(&pdev->xdev->dev,















		"read dev=%04x:%02x:%02x.%d - offset %x size %d\n",















		pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),















		PCI_FUNC(devfn), where, size);









@@ -199,8 +195,7 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,













	err = do_pci_op(pdev, &op);































	if (likely(!err)) {













		if (verbose_request)













			dev_info(&pdev->xdev->dev, "read got back value %x\n",













		dev_dbg(&pdev->xdev->dev, "read got back value %x\n",















			op.value);































		*val = op.value;










@@ -229,10 +224,8 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn,













	struct pcifront_sd *sd = bus->sysdata;















	struct pcifront_device *pdev = pcifront_get_pdev(sd);





























	if (verbose_request)













		dev_info(&pdev->xdev->dev,













			 "write dev=%04x:%02x:%02x.%d - "













			 "offset %x size %d val %x\n",













	dev_dbg(&pdev->xdev->dev,













		"write dev=%04x:%02x:%02x.%d - offset %x size %d val %x\n",















		pci_domain_nr(bus), bus->number,















		PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);

















































drivers/xen/Kconfig



+4
−0






























Original line number
Diff line number
Diff line








@@ -13,12 +13,16 @@ config XEN_BALLOON













config XEN_BALLOON_MEMORY_HOTPLUG















	bool "Memory hotplug support for Xen balloon driver"















	depends on XEN_BALLOON && MEMORY_HOTPLUG













	default y















	help















	  Memory hotplug support for Xen balloon driver allows expanding memory















	  available for the system above limit declared at system startup.















	  It is very useful on critical systems which require long















	  run without rebooting.





























	  It's also very useful for non PV domains to obtain unpopulated physical













	  memory ranges to use in order to map foreign memory or grants.





























	  Memory could be hotplugged in following steps:































	    1) target domain: ensure that memory auto online policy is in

































drivers/xen/cpu_hotplug.c



+3
−5






























Original line number
Diff line number
Diff line








@@ -93,10 +93,8 @@ static int setup_cpu_watcher(struct notifier_block *notifier,













	(void)register_xenbus_watch(&cpu_watch);































	for_each_possible_cpu(cpu) {













		if (vcpu_online(cpu) == 0) {













			device_offline(get_cpu_device(cpu));













			set_cpu_present(cpu, false);













		}













		if (vcpu_online(cpu) == 0)













			disable_hotplug_cpu(cpu);















	}































	return NOTIFY_DONE;









@@ -119,5 +117,5 @@ static int __init setup_vcpu_hotplug_event(void)













	return 0;















}





























arch_initcall(setup_vcpu_hotplug_event);













late_initcall(setup_vcpu_hotplug_event);







































drivers/xen/platform-pci.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -168,7 +168,7 @@ static const struct pci_device_id platform_pci_tbl[] = {













	{0,}















};





























static struct dev_pm_ops platform_pm_ops = {













static const struct dev_pm_ops platform_pm_ops = {















	.resume_noirq =   platform_pci_resume,















};

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE