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

Merge branches 'stable/backend.base.v3' and 'stable/gntalloc.v7' of... 

Merge branches 'stable/backend.base.v3' and 'stable/gntalloc.v7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/backend.base.v3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pci: Fix compiler error when CONFIG_XEN_PRIVILEGED_GUEST is not set.
  xen/p2m: Add EXPORT_SYMBOL_GPL to the M2P override functions.
  xen/p2m/m2p/gnttab: Support GNTMAP_host_map in the M2P override.
  xen/irq: The Xen hypervisor cleans up the PIRQs if the other domain forgot.
  xen/irq: Export 'xen_pirq_from_irq' function.
  xen/irq: Add support to check if IRQ line is shared with other domains.
  xen/irq: Check if the PCI device is owned by a domain different than DOMID_SELF.
  xen/pci: Add xen_[find|register|unregister]_device_domain_owner functions.

* 'stable/gntalloc.v7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/gntdev,gntalloc: Remove unneeded VM flags
parents dc932751 7c1bfd68 d79647ae

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

+3 −2
Original line number Diff line number Diff line
@@ -47,8 +47,9 @@ 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 m2p_add_override(unsigned long mfn, struct page *page);

extern int m2p_remove_override(struct page *page);

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

			    bool clear_pte);

extern int m2p_remove_override(struct page *page, bool clear_pte);

extern struct page *m2p_find_override(unsigned long mfn);

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

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

+16 −0
Original line number Diff line number Diff line
@@ -15,10 +15,26 @@ static inline int pci_xen_hvm_init(void) 
#endif

#if defined(CONFIG_XEN_DOM0)

void __init xen_setup_pirqs(void);

int xen_find_device_domain_owner(struct pci_dev *dev);

int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);

int xen_unregister_device_domain_owner(struct pci_dev *dev);

#else

static inline void __init xen_setup_pirqs(void)

{

}

static inline int xen_find_device_domain_owner(struct pci_dev *dev)

{

	return -1;

}

static inline int xen_register_device_domain_owner(struct pci_dev *dev,

						   uint16_t domain)

{

	return -1;

}

static inline int xen_unregister_device_domain_owner(struct pci_dev *dev)

{

	return -1;

}

#endif



#if defined(CONFIG_PCI_MSI)

arch/x86/pci/xen.c

+91 −5
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
		}

		irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq, 0,

					       (type == PCI_CAP_ID_MSIX) ?

					       "msi-x" : "msi");

					       "msi-x" : "msi",

					       DOMID_SELF);

		if (irq < 0)

			goto error;

		dev_dbg(&dev->dev,
@@ -148,7 +149,8 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
		irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i], 0,

					       (type == PCI_CAP_ID_MSIX) ?

					       "pcifront-msi-x" :

					       "pcifront-msi");

					       "pcifront-msi",

						DOMID_SELF);

		if (irq < 0)

			goto free;

		i++;
@@ -190,9 +192,16 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 


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

		struct physdev_map_pirq map_irq;

		domid_t domid;



		domid = ret = xen_find_device_domain_owner(dev);

		/* N.B. Casting int's -ENODEV to uint16_t results in 0xFFED,

		 * hence check ret value for < 0. */

		if (ret < 0)

			domid = DOMID_SELF;



		memset(&map_irq, 0, sizeof(map_irq));

		map_irq.domid = DOMID_SELF;

		map_irq.domid = domid;

		map_irq.type = MAP_PIRQ_TYPE_MSI;

		map_irq.index = -1;

		map_irq.pirq = -1;
@@ -215,14 +224,16 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 


		ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);

		if (ret) {

			dev_warn(&dev->dev, "xen map irq failed %d\n", ret);

			dev_warn(&dev->dev, "xen map irq failed %d for %d domain\n",

				 ret, domid);

			goto out;

		}



		ret = xen_bind_pirq_msi_to_irq(dev, msidesc,

					       map_irq.pirq, map_irq.index,

					       (type == PCI_CAP_ID_MSIX) ?

					       "msi-x" : "msi");

					       "msi-x" : "msi",

						domid);

		if (ret < 0)

			goto out;

	}
@@ -461,3 +472,78 @@ void __init xen_setup_pirqs(void) 
	}

}

#endif



#ifdef CONFIG_XEN_DOM0

struct xen_device_domain_owner {

	domid_t domain;

	struct pci_dev *dev;

	struct list_head list;

};



static DEFINE_SPINLOCK(dev_domain_list_spinlock);

static struct list_head dev_domain_list = LIST_HEAD_INIT(dev_domain_list);



static struct xen_device_domain_owner *find_device(struct pci_dev *dev)

{

	struct xen_device_domain_owner *owner;



	list_for_each_entry(owner, &dev_domain_list, list) {

		if (owner->dev == dev)

			return owner;

	}

	return NULL;

}



int xen_find_device_domain_owner(struct pci_dev *dev)

{

	struct xen_device_domain_owner *owner;

	int domain = -ENODEV;



	spin_lock(&dev_domain_list_spinlock);

	owner = find_device(dev);

	if (owner)

		domain = owner->domain;

	spin_unlock(&dev_domain_list_spinlock);

	return domain;

}

EXPORT_SYMBOL_GPL(xen_find_device_domain_owner);



int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain)

{

	struct xen_device_domain_owner *owner;



	owner = kzalloc(sizeof(struct xen_device_domain_owner), GFP_KERNEL);

	if (!owner)

		return -ENODEV;



	spin_lock(&dev_domain_list_spinlock);

	if (find_device(dev)) {

		spin_unlock(&dev_domain_list_spinlock);

		kfree(owner);

		return -EEXIST;

	}

	owner->domain = domain;

	owner->dev = dev;

	list_add_tail(&owner->list, &dev_domain_list);

	spin_unlock(&dev_domain_list_spinlock);

	return 0;

}

EXPORT_SYMBOL_GPL(xen_register_device_domain_owner);



int xen_unregister_device_domain_owner(struct pci_dev *dev)

{

	struct xen_device_domain_owner *owner;



	spin_lock(&dev_domain_list_spinlock);

	owner = find_device(dev);

	if (!owner) {

		spin_unlock(&dev_domain_list_spinlock);

		return -ENODEV;

	}

	list_del(&owner->list);

	spin_unlock(&dev_domain_list_spinlock);

	kfree(owner);

	return 0;

}

EXPORT_SYMBOL_GPL(xen_unregister_device_domain_owner);

#endif

arch/x86/xen/p2m.c

+6 −7
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static unsigned long mfn_hash(unsigned long mfn) 
}



/* Add an MFN override for a particular page */

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

int m2p_add_override(unsigned long mfn, struct page *page, bool clear_pte)

{

	unsigned long flags;

	unsigned long pfn;
@@ -662,7 +662,6 @@ int m2p_add_override(unsigned long mfn, struct page *page) 
	if (!PageHighMem(page)) {

		address = (unsigned long)__va(pfn << PAGE_SHIFT);

		ptep = lookup_address(address, &level);



		if (WARN(ptep == NULL || level != PG_LEVEL_4K,

					"m2p_add_override: pfn %lx not mapped", pfn))

			return -EINVAL;
@@ -674,18 +673,17 @@ int m2p_add_override(unsigned long mfn, struct page *page) 
	if (unlikely(!set_phys_to_machine(pfn, FOREIGN_FRAME(mfn))))

		return -ENOMEM;



	if (!PageHighMem(page))

	if (clear_pte && !PageHighMem(page))

		/* Just zap old mapping for now */

		pte_clear(&init_mm, address, ptep);



	spin_lock_irqsave(&m2p_override_lock, flags);

	list_add(&page->lru,  &m2p_overrides[mfn_hash(mfn)]);

	spin_unlock_irqrestore(&m2p_override_lock, flags);



	return 0;

}



int m2p_remove_override(struct page *page)

EXPORT_SYMBOL_GPL(m2p_add_override);

int m2p_remove_override(struct page *page, bool clear_pte)

{

	unsigned long flags;

	unsigned long mfn;
@@ -713,7 +711,7 @@ int m2p_remove_override(struct page *page) 
	spin_unlock_irqrestore(&m2p_override_lock, flags);

	set_phys_to_machine(pfn, page->index);



	if (!PageHighMem(page))

	if (clear_pte && !PageHighMem(page))

		set_pte_at(&init_mm, address, ptep,

				pfn_pte(pfn, PAGE_KERNEL));

		/* No tlb flush necessary because the caller already
@@ -721,6 +719,7 @@ int m2p_remove_override(struct page *page) 


	return 0;

}

EXPORT_SYMBOL_GPL(m2p_remove_override);



struct page *m2p_find_override(unsigned long mfn)

{

drivers/xen/events.c

+34 −5
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ struct irq_info 
			unsigned short gsi;

			unsigned char vector;

			unsigned char flags;

			uint16_t domid;

		} pirq;

	} u;

};
@@ -184,6 +185,7 @@ static void xen_irq_info_pirq_init(unsigned irq, 
				   unsigned short pirq,

				   unsigned short gsi,

				   unsigned short vector,

				   uint16_t domid,

				   unsigned char flags)

{

	struct irq_info *info = info_for_irq(irq);
@@ -193,6 +195,7 @@ static void xen_irq_info_pirq_init(unsigned irq, 
	info->u.pirq.pirq = pirq;

	info->u.pirq.gsi = gsi;

	info->u.pirq.vector = vector;

	info->u.pirq.domid = domid;

	info->u.pirq.flags = flags;

}
@@ -655,7 +658,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi, 
		goto out;

	}



	xen_irq_info_pirq_init(irq, 0, pirq, gsi, irq_op.vector,

	xen_irq_info_pirq_init(irq, 0, pirq, gsi, irq_op.vector, DOMID_SELF,

			       shareable ? PIRQ_SHAREABLE : 0);



out:
@@ -680,7 +683,8 @@ int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc) 
}



int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,

			     int pirq, int vector, const char *name)

			     int pirq, int vector, const char *name,

			     domid_t domid)

{

	int irq, ret;
@@ -693,7 +697,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, 
	irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_level_irq,

				      name);



	xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, 0);

	xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, domid, 0);

	ret = irq_set_msi_desc(irq, msidesc);

	if (ret < 0)

		goto error_irq;
@@ -722,9 +726,16 @@ int xen_destroy_irq(int irq) 


	if (xen_initial_domain()) {

		unmap_irq.pirq = info->u.pirq.pirq;

		unmap_irq.domid = DOMID_SELF;

		unmap_irq.domid = info->u.pirq.domid;

		rc = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap_irq);

		if (rc) {

		/* If another domain quits without making the pci_disable_msix

		 * call, the Xen hypervisor takes care of freeing the PIRQs

		 * (free_domain_pirqs).

		 */

		if ((rc == -ESRCH && info->u.pirq.domid != DOMID_SELF))

			printk(KERN_INFO "domain %d does not have %d anymore\n",

				info->u.pirq.domid, info->u.pirq.pirq);

		else if (rc) {

			printk(KERN_WARNING "unmap irq failed %d\n", rc);

			goto out;

		}
@@ -759,6 +770,12 @@ out: 
	return irq;

}





int xen_pirq_from_irq(unsigned irq)

{

	return pirq_from_irq(irq);

}

EXPORT_SYMBOL_GPL(xen_pirq_from_irq);

int bind_evtchn_to_irq(unsigned int evtchn)

{

	int irq;
@@ -1502,6 +1519,18 @@ void xen_poll_irq(int irq) 
	xen_poll_irq_timeout(irq, 0 /* no timeout */);

}



/* Check whether the IRQ line is shared with other guests. */

int xen_test_irq_shared(int irq)

{

	struct irq_info *info = info_for_irq(irq);

	struct physdev_irq_status_query irq_status = { .irq = info->u.pirq.pirq };



	if (HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query, &irq_status))

		return 0;

	return !(irq_status.flags & XENIRQSTAT_shared);

}

EXPORT_SYMBOL_GPL(xen_test_irq_shared);



void xen_irq_resume(void)

{

	unsigned int cpu, evtchn;

CRA Git | Maintained and supported by SUSTech CRA and CCSE