Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1035065/?format=api
{ "id": 1035065, "url": "http://patchwork.ozlabs.org/api/patches/1035065/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1549048453-3584-6-git-send-email-megha.dey@linux.intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1549048453-3584-6-git-send-email-megha.dey@linux.intel.com>", "list_archive_url": null, "date": "2019-02-01T19:14:12", "name": "[RFC,v4,5/6] PCI/MSI: Free MSI-X resources by group", "commit_ref": null, "pull_url": null, "state": "rfc", "archived": false, "hash": "a5a3af663ccc7fdc8efcad93fcac741ef1eb4282", "submitter": { "id": 75876, "url": "http://patchwork.ozlabs.org/api/people/75876/?format=api", "name": "Dey, Megha", "email": "megha.dey@linux.intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1549048453-3584-6-git-send-email-megha.dey@linux.intel.com/mbox/", "series": [ { "id": 89594, "url": "http://patchwork.ozlabs.org/api/series/89594/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=89594", "date": "2019-02-01T19:14:07", "name": "Introduce dynamic allocation/freeing of MSI-X vectors", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/89594/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1035065/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1035065/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dmarc=none (p=none dis=none)\n\theader.from=linux.intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 43rmzq1B1Sz9s6w\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 2 Feb 2019 06:16:23 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id BB477879F2;\n\tFri, 1 Feb 2019 19:16:21 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id y1B6use08e6R; Fri, 1 Feb 2019 19:16:17 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 1703587A0C;\n\tFri, 1 Feb 2019 19:16:17 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id AE5F41BF954\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Feb 2019 18:52:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id A9D213103D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Feb 2019 18:52:28 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 5+ws+vOBlmWS for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Feb 2019 18:52:26 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby silver.osuosl.org (Postfix) with ESMTPS id B4FDB3103B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Feb 2019 18:52:26 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t01 Feb 2019 10:50:54 -0800", "from megha-z97x-ud7-th.sc.intel.com ([143.183.85.162])\n\tby orsmga003.jf.intel.com with ESMTP; 01 Feb 2019 10:50:53 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.56,549,1539673200\"; d=\"scan'208\";a=\"123233696\"", "From": "Megha Dey <megha.dey@linux.intel.com>", "To": "linux-drivers-review@linux.intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 1 Feb 2019 11:14:12 -0800", "Message-Id": "<1549048453-3584-6-git-send-email-megha.dey@linux.intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1549048453-3584-1-git-send-email-megha.dey@linux.intel.com>", "References": "<1549048453-3584-1-git-send-email-megha.dey@linux.intel.com>", "X-Mailman-Approved-At": "Fri, 01 Feb 2019 19:16:15 +0000", "Subject": "[Intel-wired-lan] [RFC v4 5/6] PCI/MSI: Free MSI-X resources by\n\tgroup", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "ravi.v.shankar@intel.com, ashok.raj@intel.com, kyung.min.park@intel.com, \n\tjacob.jun.pan@intel.com, Megha Dey <megha.dey@linux.intel.com>,\n\tmegha.dey@intel.com", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Currently, the pci_free_irq_vectors() frees all the allocated resources\nassociated with a PCIe device when the device is being shut down. With\nthe introduction of dynamic allocation of MSI-X vectors by group ID,\nthere should exist an API which can free the resources allocated only\nto a particular group, which can be called even if the device is not\nbeing shut down. The pci_free_irq_vectors_grp() function provides this\ntype of interface.\n\nThe existing pci_free_irq_vectors() can be called along side this API.\n\nSigned-off-by: Megha Dey <megha.dey@linux.intel.com>\n---\n drivers/pci/msi.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++\n include/linux/msi.h | 2 +\n include/linux/pci.h | 9 ++++\n kernel/irq/msi.c | 29 ++++++++++++\n 4 files changed, 169 insertions(+)", "diff": "diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c\nindex e7bbd21..a775c79 100644\n--- a/drivers/pci/msi.c\n+++ b/drivers/pci/msi.c\n@@ -53,9 +53,23 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev)\n \telse\n \t\tarch_teardown_msi_irqs(dev);\n }\n+\n+static void pci_msi_teardown_msi_irqs_grp(struct pci_dev *dev, int group_id)\n+{\n+\tstruct irq_domain *domain;\n+\n+\tdomain = dev_get_msi_domain(&dev->dev);\n+\n+\tif (domain && irq_domain_is_hierarchy(domain))\n+\t\tmsi_domain_free_irqs_grp(domain, &dev->dev, group_id);\n+\telse\n+\t\tarch_teardown_msi_irqs_grp(dev, group_id);\n+}\n+\n #else\n #define pci_msi_setup_msi_irqs\t\tarch_setup_msi_irqs\n #define pci_msi_teardown_msi_irqs\tarch_teardown_msi_irqs\n+#define pci_msi_teardown_msi_irqs_grp\tdefault_teardown_msi_irqs_grp\n #endif\n \n /* Arch hooks */\n@@ -400,6 +414,65 @@ static void free_msi_irqs(struct pci_dev *dev)\n \t}\n }\n \n+char msix_sysfs_grp[] = \"msi_irqs\";\n+\n+static int free_msi_irqs_grp(struct pci_dev *dev, int group_id)\n+{\n+\tstruct list_head *msi_list = dev_to_msi_list(&dev->dev);\n+\tstruct msi_desc *entry, *tmp;\n+\tstruct attribute **msi_attrs;\n+\tstruct device_attribute *dev_attr;\n+\tint i, *group = NULL;\n+\tlong vec;\n+\tstruct msix_sysfs *msix_sysfs_entry, *tmp_msix;\n+\tstruct list_head *pci_msix = &dev->msix_sysfs;\n+\tint num_vec = 0;\n+\n+\tfor_each_pci_msi_entry(entry, dev) {\n+\t\tgroup = idr_find(dev->dev.msix_dev_idr->entry_idr,\n+\t\t\t\t\tentry->msi_attrib.entry_nr);\n+\t\tif (*group == group_id && entry->irq)\n+\t\t\tfor (i = 0; i < entry->nvec_used; i++)\n+\t\t\t\tBUG_ON(irq_has_action(entry->irq + i));\n+\t}\n+\n+\tpci_msi_teardown_msi_irqs_grp(dev, group_id);\n+\n+\tlist_for_each_entry_safe(entry, tmp, msi_list, list) {\n+\t\tgroup = idr_find(dev->dev.msix_dev_idr->entry_idr,\n+\t\t\t\t\t\tentry->msi_attrib.entry_nr);\n+\t\tif (*group == group_id) {\n+\t\t\tidr_remove(dev->dev.msix_dev_idr->entry_idr,\n+\t\t\t\t\t\tentry->msi_attrib.entry_nr);\n+\t\t\tlist_del(&entry->list);\n+\t\t\tfree_msi_entry(entry);\n+\t\t}\n+\t}\n+\n+\tlist_for_each_entry_safe(msix_sysfs_entry, tmp_msix, pci_msix, list) {\n+\t\tif (msix_sysfs_entry->group_id == group_id) {\n+\t\t\tmsi_attrs = msix_sysfs_entry->msi_irq_group->attrs;\n+\t\t\tfor (i = 0; i < msix_sysfs_entry->vecs_in_grp; i++) {\n+\t\t\t\tif (!i)\n+\t\t\t\t\tnum_vec = msix_sysfs_entry->vecs_in_grp;\n+\t\t\t\tdev_attr = container_of(msi_attrs[i],\n+\t\t\t\t\t\tstruct device_attribute, attr);\n+\t\t\t\tsysfs_remove_file_from_group(&dev->dev.kobj,\n+\t\t\t\t\t&dev_attr->attr, msix_sysfs_grp);\n+\t\t\t\tif (kstrtol(dev_attr->attr.name, 10, &vec))\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\tkfree(dev_attr->attr.name);\n+\t\t\t\tkfree(dev_attr);\n+\t\t\t}\n+\t\t\tmsix_sysfs_entry->msi_irq_group = NULL;\n+\t\t\tlist_del(&msix_sysfs_entry->list);\n+\t\t\tidr_remove(dev->dev.msix_dev_idr->grp_idr, group_id);\n+\t\t\tkfree(msix_sysfs_entry);\n+\t\t}\n+\t}\n+\treturn num_vec;\n+}\n+\n static void pci_intx_for_msi(struct pci_dev *dev, int enable)\n {\n \tif (!(dev->dev_flags & PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG))\n@@ -1055,6 +1128,47 @@ void pci_disable_msix(struct pci_dev *dev)\n }\n EXPORT_SYMBOL(pci_disable_msix);\n \n+static void pci_msix_shutdown_grp(struct pci_dev *dev, int group_id)\n+{\n+\tstruct msi_desc *entry;\n+\tint grp_present = 0, *group = NULL;\n+\n+\tif (pci_dev_is_disconnected(dev)) {\n+\t\tdev->msix_enabled = 0;\n+\t\treturn;\n+\t}\n+\n+\t/* Return the device with MSI-X masked as initial states */\n+\tfor_each_pci_msi_entry(entry, dev) {\n+\t\tgroup = idr_find(dev->dev.msix_dev_idr->entry_idr,\n+\t\t\t\t\tentry->msi_attrib.entry_nr);\n+\t\tif (*group == group_id) {\n+\t\t\t/* Keep cached states to be restored */\n+\t\t\t__pci_msix_desc_mask_irq(entry, 1);\n+\t\t\tgrp_present = 1;\n+\t\t}\n+\t}\n+\n+\tif (!grp_present) {\n+\t\tpci_err(dev, \"Group to be disabled not present\\n\");\n+\t\treturn;\n+\t}\n+}\n+\n+int pci_disable_msix_grp(struct pci_dev *dev, int group_id)\n+{\n+\tint num_vecs;\n+\n+\tif (!pci_msi_enable || !dev)\n+\t\treturn -EINVAL;\n+\n+\tpci_msix_shutdown_grp(dev, group_id);\n+\tnum_vecs = free_msi_irqs_grp(dev, group_id);\n+\n+\treturn num_vecs;\n+}\n+EXPORT_SYMBOL(pci_disable_msix_grp);\n+\n void pci_no_msi(void)\n {\n \tpci_msi_enable = 0;\n@@ -1355,6 +1469,21 @@ void pci_free_irq_vectors(struct pci_dev *dev)\n EXPORT_SYMBOL(pci_free_irq_vectors);\n \n /**\n+ * pci_free_irq_vectors_grp - free previously allocated IRQs for a\n+ * device associated with a group\n+ * @dev: PCI device to operate on\n+ * @group:\t\tgroup to be freed\n+ *\n+ * Undoes the allocations and enabling in pci_alloc_irq_vectors_dyn().\n+ * Can be only called for MSIx vectors.\n+ */\n+int pci_free_irq_vectors_grp(struct pci_dev *dev, int group_id)\n+{\n+\treturn pci_disable_msix_grp(dev, group_id);\n+}\n+EXPORT_SYMBOL(pci_free_irq_vectors_grp);\n+\n+/**\n * pci_irq_vector - return Linux IRQ number of a device vector\n * @dev: PCI device to operate on\n * @nr: device-relative interrupt vector index (0-based).\ndiff --git a/include/linux/msi.h b/include/linux/msi.h\nindex 6be0377..fac011e 100644\n--- a/include/linux/msi.h\n+++ b/include/linux/msi.h\n@@ -313,6 +313,8 @@ struct irq_domain *msi_create_irq_domain(struct fwnode_handle *fwnode,\n int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,\n \t\t\t int nvec);\n void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev);\n+void msi_domain_free_irqs_grp(struct irq_domain *domain, struct device *dev,\n+\t\t\t\t\t\t\t\tint group_id);\n struct msi_domain_info *msi_get_domain_info(struct irq_domain *domain);\n \n struct irq_domain *platform_msi_create_irq_domain(struct fwnode_handle *fwnode,\ndiff --git a/include/linux/pci.h b/include/linux/pci.h\nindex 2e2f4c9..25792dd 100644\n--- a/include/linux/pci.h\n+++ b/include/linux/pci.h\n@@ -1389,6 +1389,7 @@ int pci_msi_vec_count(struct pci_dev *dev);\n void pci_disable_msi(struct pci_dev *dev);\n int pci_msix_vec_count(struct pci_dev *dev);\n void pci_disable_msix(struct pci_dev *dev);\n+int pci_disable_msix_grp(struct pci_dev *dev, int group_id);\n void pci_restore_msi_state(struct pci_dev *dev);\n int pci_msi_enabled(void);\n int pci_enable_msi(struct pci_dev *dev);\n@@ -1412,6 +1413,7 @@ int pci_alloc_irq_vectors_affinity_dyn(struct pci_dev *dev,\n \t\t\t\t int *group_id, bool one_shot);\n \n void pci_free_irq_vectors(struct pci_dev *dev);\n+int pci_free_irq_vectors_grp(struct pci_dev *dev, int group_id);\n int pci_irq_vector(struct pci_dev *dev, unsigned int nr);\n int pci_irq_vector_group(struct pci_dev *dev, unsigned int nr,\n \t\t\t\t\t\tunsigned int group_id);\n@@ -1423,6 +1425,8 @@ static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }\n static inline void pci_disable_msi(struct pci_dev *dev) { }\n static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; }\n static inline void pci_disable_msix(struct pci_dev *dev) { }\n+static inline int pci_disable_msix_grp(struct pci_dev *dev, int group_id)\n+\t\t\t\t\t\t\t{ return -ENOSYS}\n static inline void pci_restore_msi_state(struct pci_dev *dev) { }\n static inline int pci_msi_enabled(void) { return 0; }\n static inline int pci_enable_msi(struct pci_dev *dev)\n@@ -1459,6 +1463,11 @@ static inline void pci_free_irq_vectors(struct pci_dev *dev)\n {\n }\n \n+static inline void pci_free_irq_vectors_grp(struct pci_dev *dev, int group_id)\n+{\n+\treturn 0;\n+}\n+\n static inline int pci_irq_vector(struct pci_dev *dev, unsigned int nr)\n {\n \tif (WARN_ON_ONCE(nr > 0))\ndiff --git a/kernel/irq/msi.c b/kernel/irq/msi.c\nindex 5cfa931..07a120b 100644\n--- a/kernel/irq/msi.c\n+++ b/kernel/irq/msi.c\n@@ -511,6 +511,35 @@ void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev)\n }\n \n /**\n+ * msi_domain_free_irqs_grp - Free interrupts belonging to a group from\n+ * a MSI interrupt @domain associated to @dev\n+ * @domain:\tThe domain to managing the interrupts\n+ * @dev:\tPointer to device struct of the device for which the interrupt\n+ *\t\tshould be freed\n+ * @group_id:\tThe group ID to be freed\n+ */\n+void msi_domain_free_irqs_grp(struct irq_domain *domain, struct device *dev,\n+\t\t\t\t\t\t\t\tint group_id)\n+{\n+\tstruct msi_desc *desc;\n+\tint *group = NULL;\n+\n+\tfor_each_msi_entry(desc, dev) {\n+\t\tgroup = idr_find(dev->msix_dev_idr->entry_idr,\n+\t\t\t\t\t\tdesc->msi_attrib.entry_nr);\n+\t\t/*\n+\t\t * We might have failed to allocate an MSI early\n+\t\t * enough that there is no IRQ associated to this\n+\t\t * entry. If that's the case, don't do anything.\n+\t\t */\n+\t\tif (*group == group_id) {\n+\t\t\tirq_domain_free_irqs(desc->irq, desc->nvec_used);\n+\t\t\tdesc->irq = 0;\n+\t\t}\n+\t}\n+}\n+\n+/**\n * msi_get_domain_info - Get the MSI interrupt domain info for @domain\n * @domain:\tThe interrupt domain to retrieve data from\n *\n", "prefixes": [ "RFC", "v4", "5/6" ] }