From: Dave Jiang <dave.jiang@intel.com>
To: vkoul@kernel.org, megha.dey@intel.com, maz@kernel.org,
bhelgaas@google.com, rafael@kernel.org,
gregkh@linuxfoundation.org, tglx@linutronix.de, hpa@zytor.com,
alex.williamson@redhat.com, jacob.jun.pan@intel.com,
ashok.raj@intel.com, jgg@mellanox.com, yi.l.liu@intel.com,
baolu.lu@intel.com, kevin.tian@intel.com,
sanjay.k.kumar@intel.com, tony.luck@intel.com,
jing.lin@intel.com, dan.j.williams@intel.com,
kwankhede@nvidia.com, eric.auger@redhat.com, parav@mellanox.com,
jgg@mellanox.com, rafael@kernel.org, dave.hansen@intel.com,
netanelg@mellanox.com, shahafs@mellanox.com,
yan.y.zhao@linux.intel.com, pbonzini@redhat.com,
samuel.ortiz@intel.com, mona.hossain@intel.com
Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
x86@kernel.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org
Subject: [PATCH RFC v2 03/18] irq/dev-msi: Create IR-DEV-MSI irq domain
Date: Tue, 21 Jul 2020 09:02:35 -0700 [thread overview]
Message-ID: <159534735519.28840.10435935598386192252.stgit@djiang5-desk3.ch.intel.com> (raw)
In-Reply-To: <159534667974.28840.2045034360240786644.stgit@djiang5-desk3.ch.intel.com>
From: Megha Dey <megha.dey@intel.com>
When DEV_MSI is enabled, the dev_msi_default_domain is updated to the
base DEV-MSI irq domain. If interrupt remapping is enabled, we create
a new IR-DEV-MSI irq domain and update the dev_msi_default domain to
the same.
For X86, introduce a new irq_alloc_type which will be used by the
interrupt remapping driver.
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Megha Dey <megha.dey@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
arch/x86/include/asm/hw_irq.h | 1 +
arch/x86/kernel/apic/msi.c | 12 ++++++
drivers/base/dev-msi.c | 66 +++++++++++++++++++++++++++++++----
drivers/iommu/intel/irq_remapping.c | 11 +++++-
include/linux/intel-iommu.h | 1 +
include/linux/irqdomain.h | 11 ++++++
include/linux/msi.h | 3 ++
7 files changed, 96 insertions(+), 9 deletions(-)
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index 8ecd7570589d..bdddd63add41 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -40,6 +40,7 @@ enum irq_alloc_type {
X86_IRQ_ALLOC_TYPE_MSIX,
X86_IRQ_ALLOC_TYPE_DMAR,
X86_IRQ_ALLOC_TYPE_UV,
+ X86_IRQ_ALLOC_TYPE_DEV_MSI,
};
struct irq_alloc_info {
diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c
index 5cbaca58af95..8b25cadbae09 100644
--- a/arch/x86/kernel/apic/msi.c
+++ b/arch/x86/kernel/apic/msi.c
@@ -507,3 +507,15 @@ int hpet_assign_irq(struct irq_domain *domain, struct hpet_channel *hc,
return irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, &info);
}
#endif
+
+#ifdef CONFIG_DEV_MSI
+int dev_msi_prepare(struct irq_domain *domain, struct device *dev,
+ int nvec, msi_alloc_info_t *arg)
+{
+ memset(arg, 0, sizeof(*arg));
+
+ arg->type = X86_IRQ_ALLOC_TYPE_DEV_MSI;
+
+ return 0;
+}
+#endif
diff --git a/drivers/base/dev-msi.c b/drivers/base/dev-msi.c
index 240ccc353933..43d6ed3ba10f 100644
--- a/drivers/base/dev-msi.c
+++ b/drivers/base/dev-msi.c
@@ -5,6 +5,7 @@
* Author: Megha Dey <megha.dey@intel.com>
*/
+#include <linux/device.h>
#include <linux/irq.h>
#include <linux/irqdomain.h>
#include <linux/msi.h>
@@ -32,7 +33,7 @@ static void dev_msi_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc)
arg->hwirq = dev_msi_calc_hwirq(desc);
}
-static int dev_msi_prepare(struct irq_domain *domain, struct device *dev,
+int __weak dev_msi_prepare(struct irq_domain *domain, struct device *dev,
int nvec, msi_alloc_info_t *arg)
{
memset(arg, 0, sizeof(*arg));
@@ -81,15 +82,66 @@ static int __init create_dev_msi_domain(void)
if (!fn)
return -ENXIO;
- dev_msi_default_domain = msi_create_irq_domain(fn, &dev_msi_domain_info, parent);
+ /*
+ * This initcall may come after remap code is initialized. Ensure that
+ * dev_msi_default domain is updated correctly.
+ */
if (!dev_msi_default_domain) {
- pr_warn("failed to initialize irqdomain for DEV-MSI.\n");
- return -ENXIO;
+ dev_msi_default_domain = msi_create_irq_domain(fn, &dev_msi_domain_info, parent);
+ if (!dev_msi_default_domain) {
+ pr_warn("failed to initialize irqdomain for DEV-MSI.\n");
+ return -ENXIO;
+ }
+
+ irq_domain_update_bus_token(dev_msi_default_domain, DOMAIN_BUS_PLATFORM_MSI);
+ irq_domain_free_fwnode(fn);
}
- irq_domain_update_bus_token(dev_msi_default_domain, DOMAIN_BUS_PLATFORM_MSI);
- irq_domain_free_fwnode(fn);
-
return 0;
}
device_initcall(create_dev_msi_domain);
+
+#ifdef CONFIG_IRQ_REMAP
+static struct irq_chip dev_msi_ir_controller = {
+ .name = "IR-DEV-MSI",
+ .irq_unmask = platform_msi_unmask_irq,
+ .irq_mask = platform_msi_mask_irq,
+ .irq_write_msi_msg = platform_msi_write_msg,
+ .irq_ack = irq_chip_ack_parent,
+ .irq_retrigger = irq_chip_retrigger_hierarchy,
+ .irq_set_vcpu_affinity = irq_chip_set_vcpu_affinity_parent,
+ .flags = IRQCHIP_SKIP_SET_WAKE,
+};
+
+static struct msi_domain_info dev_msi_ir_domain_info = {
+ .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS,
+ .ops = &dev_msi_domain_ops,
+ .chip = &dev_msi_ir_controller,
+ .handler = handle_edge_irq,
+ .handler_name = "edge",
+};
+
+struct irq_domain *create_remap_dev_msi_irq_domain(struct irq_domain *parent,
+ const char *name)
+{
+ struct fwnode_handle *fn;
+ struct irq_domain *domain;
+
+ fn = irq_domain_alloc_named_fwnode(name);
+ if (!fn)
+ return NULL;
+
+ domain = msi_create_irq_domain(fn, &dev_msi_ir_domain_info, parent);
+ if (!domain) {
+ pr_warn("failed to initialize irqdomain for IR-DEV-MSI.\n");
+ return ERR_PTR(-ENXIO);
+ }
+
+ irq_domain_update_bus_token(domain, DOMAIN_BUS_PLATFORM_MSI);
+
+ if (!dev_msi_default_domain)
+ dev_msi_default_domain = domain;
+
+ return domain;
+}
+#endif
diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
index 7f8769800815..51872aabe5f8 100644
--- a/drivers/iommu/intel/irq_remapping.c
+++ b/drivers/iommu/intel/irq_remapping.c
@@ -573,6 +573,10 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)
"INTEL-IR-MSI",
iommu->seq_id);
+ iommu->ir_dev_msi_domain =
+ create_remap_dev_msi_irq_domain(iommu->ir_domain,
+ "INTEL-IR-DEV-MSI");
+
ir_table->base = page_address(pages);
ir_table->bitmap = bitmap;
iommu->ir_table = ir_table;
@@ -1299,9 +1303,10 @@ static void intel_irq_remapping_prepare_irte(struct intel_ir_data *data,
case X86_IRQ_ALLOC_TYPE_HPET:
case X86_IRQ_ALLOC_TYPE_MSI:
case X86_IRQ_ALLOC_TYPE_MSIX:
+ case X86_IRQ_ALLOC_TYPE_DEV_MSI:
if (info->type == X86_IRQ_ALLOC_TYPE_HPET)
set_hpet_sid(irte, info->hpet_id);
- else
+ else if (info->type != X86_IRQ_ALLOC_TYPE_DEV_MSI)
set_msi_sid(irte, info->msi_dev);
msg->address_hi = MSI_ADDR_BASE_HI;
@@ -1353,8 +1358,10 @@ static int intel_irq_remapping_alloc(struct irq_domain *domain,
if (!info || !iommu)
return -EINVAL;
+
if (nr_irqs > 1 && info->type != X86_IRQ_ALLOC_TYPE_MSI &&
- info->type != X86_IRQ_ALLOC_TYPE_MSIX)
+ info->type != X86_IRQ_ALLOC_TYPE_MSIX &&
+ info->type != X86_IRQ_ALLOC_TYPE_DEV_MSI)
return -EINVAL;
/*
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index d129baf7e0b8..3b868d1c43df 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -596,6 +596,7 @@ struct intel_iommu {
struct ir_table *ir_table; /* Interrupt remapping info */
struct irq_domain *ir_domain;
struct irq_domain *ir_msi_domain;
+ struct irq_domain *ir_dev_msi_domain;
#endif
struct iommu_device iommu; /* IOMMU core code handle */
int node;
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index b37350c4fe37..e537d7b50cee 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -589,6 +589,17 @@ irq_domain_hierarchical_is_msi_remap(struct irq_domain *domain)
}
#endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */
+#if defined(CONFIG_DEV_MSI) && defined(CONFIG_IRQ_REMAP)
+extern struct irq_domain *create_remap_dev_msi_irq_domain(struct irq_domain *parent,
+ const char *name);
+#else
+static inline struct irq_domain *create_remap_dev_msi_irq_domain(struct irq_domain *parent,
+ const char *name)
+{
+ return NULL;
+}
+#endif
+
#else /* CONFIG_IRQ_DOMAIN */
static inline void irq_dispose_mapping(unsigned int virq) { }
static inline struct irq_domain *irq_find_matching_fwnode(
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 1da97f905720..7098ba566bcd 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -378,6 +378,9 @@ void *platform_msi_get_host_data(struct irq_domain *domain);
void platform_msi_write_msg(struct irq_data *data, struct msi_msg *msg);
void platform_msi_unmask_irq(struct irq_data *data);
void platform_msi_mask_irq(struct irq_data *data);
+
+int dev_msi_prepare(struct irq_domain *domain, struct device *dev,
+ int nvec, msi_alloc_info_t *arg);
#endif /* CONFIG_GENERIC_MSI_IRQ_DOMAIN */
#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN
next prev parent reply other threads:[~2020-07-21 16:02 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 16:02 [PATCH RFC v2 00/18] Add VFIO mediated device support and DEV-MSI support for the idxd driver Dave Jiang
2020-07-21 16:02 ` [PATCH RFC v2 01/18] platform-msi: Introduce platform_msi_ops Dave Jiang
2020-07-21 16:02 ` [PATCH RFC v2 02/18] irq/dev-msi: Add support for a new DEV_MSI irq domain Dave Jiang
2020-07-21 16:13 ` Jason Gunthorpe
2020-07-22 16:50 ` Dey, Megha
2020-07-22 18:52 ` Marc Zyngier
2020-07-22 19:59 ` Jason Gunthorpe
2020-07-23 8:51 ` Marc Zyngier
2020-07-24 0:16 ` Jason Gunthorpe
2020-07-24 0:36 ` Thomas Gleixner
2020-08-05 19:18 ` Dey, Megha
2020-08-05 22:15 ` Jason Gunthorpe
2020-08-05 22:36 ` Dey, Megha
2020-08-05 22:53 ` Jason Gunthorpe
2020-08-06 0:13 ` Dey, Megha
2020-08-06 0:19 ` Jason Gunthorpe
2020-08-06 0:32 ` Dey, Megha
2020-08-06 0:46 ` Jason Gunthorpe
2020-08-06 17:10 ` Thomas Gleixner
2020-08-06 17:58 ` Dey, Megha
2020-08-06 20:21 ` Thomas Gleixner
2020-08-06 22:27 ` Dey, Megha
2020-08-07 8:48 ` Thomas Gleixner
2020-08-07 12:06 ` Jason Gunthorpe
2020-08-07 12:38 ` gregkh
2020-08-07 13:34 ` Jason Gunthorpe
2020-08-07 16:47 ` Thomas Gleixner
2020-08-07 17:54 ` Dey, Megha
2020-08-07 18:39 ` Jason Gunthorpe
2020-08-07 20:31 ` Dey, Megha
2020-08-08 19:47 ` Thomas Gleixner
2020-08-10 21:46 ` Thomas Gleixner
2020-08-11 9:53 ` Thomas Gleixner
2020-08-11 18:46 ` Dey, Megha
2020-08-11 21:25 ` Thomas Gleixner
2020-08-11 18:39 ` Dey, Megha
2020-08-11 22:39 ` Thomas Gleixner
2020-08-07 15:22 ` Thomas Gleixner
2020-08-05 18:55 ` Dey, Megha
2020-07-21 16:02 ` Dave Jiang [this message]
2020-07-21 16:21 ` [PATCH RFC v2 03/18] irq/dev-msi: Create IR-DEV-MSI " Jason Gunthorpe
2020-07-22 17:03 ` Dey, Megha
2020-07-22 17:33 ` Jason Gunthorpe
2020-07-22 20:44 ` Thomas Gleixner
2020-08-05 19:02 ` Dey, Megha
2020-07-21 16:02 ` [PATCH RFC v2 04/18] irq/dev-msi: Introduce APIs to allocate/free dev-msi interrupts Dave Jiang
2020-07-21 16:25 ` Jason Gunthorpe
2020-07-22 17:05 ` Dey, Megha
2020-07-22 17:35 ` Jason Gunthorpe
2020-08-05 20:19 ` Dey, Megha
2020-07-21 16:02 ` [PATCH RFC v2 05/18] dmaengine: idxd: add support for readonly config devices Dave Jiang
2020-07-21 16:02 ` [PATCH RFC v2 06/18] dmaengine: idxd: add interrupt handle request support Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 07/18] dmaengine: idxd: add DEV-MSI support in base driver Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 08/18] dmaengine: idxd: add device support functions in prep for mdev Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 09/18] dmaengine: idxd: add basic mdev registration and helper functions Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 10/18] dmaengine: idxd: add emulation rw routines Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 11/18] dmaengine: idxd: prep for virtual device commands Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 12/18] dmaengine: idxd: virtual device commands emulation Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 13/18] dmaengine: idxd: ims setup for the vdcm Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 14/18] dmaengine: idxd: add mdev type as a new wq type Dave Jiang
2020-07-21 16:03 ` [PATCH RFC v2 15/18] dmaengine: idxd: add dedicated wq mdev type Dave Jiang
2020-07-21 16:04 ` [PATCH RFC v2 16/18] dmaengine: idxd: add new wq state for mdev Dave Jiang
2020-07-21 16:04 ` [PATCH RFC v2 17/18] dmaengine: idxd: add error notification from host driver to mediated device Dave Jiang
2020-07-21 16:04 ` [PATCH RFC v2 18/18] dmaengine: idxd: add ABI documentation for mediated device support Dave Jiang
2020-07-21 16:28 ` [PATCH RFC v2 00/18] Add VFIO mediated device support and DEV-MSI support for the idxd driver Greg KH
2020-07-21 17:17 ` Dave Jiang
2020-07-21 21:35 ` Dan Williams
2020-07-21 16:45 ` Jason Gunthorpe
2020-07-21 18:00 ` Dave Jiang
2020-07-22 17:31 ` Dey, Megha
2020-07-22 18:16 ` Jason Gunthorpe
2020-07-21 23:54 ` Tian, Kevin
2020-07-24 0:19 ` Jason Gunthorpe
2020-08-06 1:22 ` Alex Williamson
2020-08-07 12:19 ` Jason Gunthorpe
2020-08-10 7:32 ` Tian, Kevin
2020-08-11 17:00 ` Alex Williamson
2020-08-12 1:58 ` Tian, Kevin
2020-08-12 2:36 ` Alex Williamson
2020-08-12 3:35 ` Tian, Kevin
2020-08-12 3:28 ` Jason Wang
2020-08-12 4:05 ` Tian, Kevin
2020-08-13 4:33 ` Jason Wang
2020-08-13 5:26 ` Tian, Kevin
2020-08-13 6:01 ` Jason Wang
2020-08-14 13:23 ` Jason Gunthorpe
2020-08-17 2:24 ` Tian, Kevin
2020-08-14 13:35 ` Jason Gunthorpe
2020-08-17 2:12 ` Tian, Kevin
2020-08-18 0:43 ` Jason Gunthorpe
2020-08-18 1:09 ` Tian, Kevin
2020-08-18 11:50 ` Jason Gunthorpe
2020-08-18 16:27 ` Paolo Bonzini
2020-08-18 16:49 ` Jason Gunthorpe
2020-08-18 17:05 ` Paolo Bonzini
2020-08-18 17:18 ` Jason Gunthorpe
2020-08-19 7:29 ` Tian, Kevin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159534735519.28840.10435935598386192252.stgit@djiang5-desk3.ch.intel.com \
--to=dave.jiang@intel.com \
--cc=alex.williamson@redhat.com \
--cc=ashok.raj@intel.com \
--cc=baolu.lu@intel.com \
--cc=bhelgaas@google.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=eric.auger@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jacob.jun.pan@intel.com \
--cc=jgg@mellanox.com \
--cc=jing.lin@intel.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=maz@kernel.org \
--cc=megha.dey@intel.com \
--cc=mona.hossain@intel.com \
--cc=netanelg@mellanox.com \
--cc=parav@mellanox.com \
--cc=pbonzini@redhat.com \
--cc=rafael@kernel.org \
--cc=samuel.ortiz@intel.com \
--cc=sanjay.k.kumar@intel.com \
--cc=shahafs@mellanox.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=vkoul@kernel.org \
--cc=x86@kernel.org \
--cc=yan.y.zhao@linux.intel.com \
--cc=yi.l.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).