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

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

Pull Xen features and fixes from David Vrabel:
 "Support PCI devices with multiple MSIs, performance improvement for
  kernel-based backends (by not populated m2p overrides when mapping),
  and assorted minor bug fixes and cleanups"

* tag 'stable/for-linus-3.15-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/acpi-processor: fix enabling interrupts on syscore_resume
  xen/grant-table: Refactor gnttab_[un]map_refs to avoid m2p_override
  xen: remove XEN_PRIVILEGED_GUEST
  xen: add support for MSI message groups
  xen-pciback: Use pci_enable_msix_exact() instead of pci_enable_msix()
  xen/xenbus: remove unused xenbus_bind_evtchn()
  xen/events: remove unnecessary call to bind_evtchn_to_cpu()
  xen/events: remove the unused resend_irq_on_evtchn()
  drivers:xen-selfballoon:reset 'frontswap_inertia_counter' after frontswap_shrink
  drivers: xen: Include appropriate header file in pcpu.c
  drivers: xen: Mark function as static in platform-pci.c
parents 32d01dc7 cd979883

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

+6 −9
Original line number Diff line number Diff line
@@ -97,16 +97,13 @@ static inline pte_t *lookup_address(unsigned long address, unsigned int *level) 
	return NULL;

}



static inline int m2p_add_override(unsigned long mfn, struct page *page,

		struct gnttab_map_grant_ref *kmap_op)

{

	return 0;

}

extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,

				   struct gnttab_map_grant_ref *kmap_ops,

				   struct page **pages, unsigned int count);



static inline int m2p_remove_override(struct page *page, bool clear_pte)

{

	return 0;

}

extern int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

				     struct gnttab_map_grant_ref *kmap_ops,

				     struct page **pages, unsigned int count);



bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);

bool __set_phys_to_machine_multi(unsigned long pfn, unsigned long mfn,

arch/arm/xen/p2m.c

+32 −0
Original line number Diff line number Diff line
@@ -146,6 +146,38 @@ unsigned long __mfn_to_pfn(unsigned long mfn) 
}

EXPORT_SYMBOL_GPL(__mfn_to_pfn);



int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,

			    struct gnttab_map_grant_ref *kmap_ops,

			    struct page **pages, unsigned int count)

{

	int i;



	for (i = 0; i < count; i++) {

		if (map_ops[i].status)

			continue;

		set_phys_to_machine(map_ops[i].host_addr >> PAGE_SHIFT,

				    map_ops[i].dev_bus_addr >> PAGE_SHIFT);

	}



	return 0;

}

EXPORT_SYMBOL_GPL(set_foreign_p2m_mapping);



int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

			      struct gnttab_map_grant_ref *kmap_ops,

			      struct page **pages, unsigned int count)

{

	int i;



	for (i = 0; i < count; i++) {

		set_phys_to_machine(unmap_ops[i].host_addr >> PAGE_SHIFT,

				    INVALID_P2M_ENTRY);

	}



	return 0;

}

EXPORT_SYMBOL_GPL(clear_foreign_p2m_mapping);



bool __set_phys_to_machine_multi(unsigned long pfn,

		unsigned long mfn, unsigned long nr_pages)

{

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

+9 −2
Original line number Diff line number Diff line
@@ -49,10 +49,17 @@ extern bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn); 
extern unsigned long set_phys_range_identity(unsigned long pfn_s,

					     unsigned long pfn_e);



extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,

				   struct gnttab_map_grant_ref *kmap_ops,

				   struct page **pages, unsigned int count);

extern int m2p_add_override(unsigned long mfn, struct page *page,

			    struct gnttab_map_grant_ref *kmap_op);

extern int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

				     struct gnttab_map_grant_ref *kmap_ops,

				     struct page **pages, unsigned int count);

extern int m2p_remove_override(struct page *page,

				struct gnttab_map_grant_ref *kmap_op);

			       struct gnttab_map_grant_ref *kmap_op,

			       unsigned long mfn);

extern struct page *m2p_find_override(unsigned long mfn);

extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);

arch/x86/pci/xen.c

+20 −9
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
	i = 0;

	list_for_each_entry(msidesc, &dev->msi_list, list) {

		irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i],

					       (type == PCI_CAP_ID_MSI) ? nvec : 1,

					       (type == PCI_CAP_ID_MSIX) ?

					       "pcifront-msi-x" :

					       "pcifront-msi",
@@ -245,6 +246,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
				"xen: msi already bound to pirq=%d\n", pirq);

		}

		irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq,

					       (type == PCI_CAP_ID_MSI) ? nvec : 1,

					       (type == PCI_CAP_ID_MSIX) ?

					       "msi-x" : "msi",

					       DOMID_SELF);
@@ -269,9 +271,6 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
	int ret = 0;

	struct msi_desc *msidesc;



	if (type == PCI_CAP_ID_MSI && nvec > 1)

		return 1;



	list_for_each_entry(msidesc, &dev->msi_list, list) {

		struct physdev_map_pirq map_irq;

		domid_t domid;
@@ -291,7 +290,10 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
			      (pci_domain_nr(dev->bus) << 16);

		map_irq.devfn = dev->devfn;



		if (type == PCI_CAP_ID_MSIX) {

		if (type == PCI_CAP_ID_MSI && nvec > 1) {

			map_irq.type = MAP_PIRQ_TYPE_MULTI_MSI;

			map_irq.entry_nr = nvec;

		} else if (type == PCI_CAP_ID_MSIX) {

			int pos;

			u32 table_offset, bir;
@@ -308,6 +310,16 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
		if (pci_seg_supported)

			ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq,

						    &map_irq);

		if (type == PCI_CAP_ID_MSI && nvec > 1 && ret) {

			/*

			 * If MAP_PIRQ_TYPE_MULTI_MSI is not available

			 * there's nothing else we can do in this case.

			 * Just set ret > 0 so driver can retry with

			 * single MSI.

			 */

			ret = 1;

			goto out;

		}

		if (ret == -EINVAL && !pci_domain_nr(dev->bus)) {

			map_irq.type = MAP_PIRQ_TYPE_MSI;

			map_irq.index = -1;
@@ -324,10 +336,9 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
			goto out;

		}



		ret = xen_bind_pirq_msi_to_irq(dev, msidesc,

					       map_irq.pirq,

					       (type == PCI_CAP_ID_MSIX) ?

					       "msi-x" : "msi",

		ret = xen_bind_pirq_msi_to_irq(dev, msidesc, map_irq.pirq,

		                               (type == PCI_CAP_ID_MSI) ? nvec : 1,

		                               (type == PCI_CAP_ID_MSIX) ? "msi-x" : "msi",

		                               domid);

		if (ret < 0)

			goto out;

arch/x86/xen/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ config XEN_DOM0 
	depends on XEN && PCI_XEN && SWIOTLB_XEN

	depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI



# Dummy symbol since people have come to rely on the PRIVILEGED_GUEST

# name in tools.

config XEN_PRIVILEGED_GUEST

	def_bool XEN_DOM0



config XEN_PVHVM

	def_bool y

	depends on XEN && PCI && X86_LOCAL_APIC

CRA Git | Maintained and supported by SUSTech CRA and CCSE