From: Paul Durrant <paul.durrant@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: "Kevin Tian" <kevin.tian@intel.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Wei Liu" <wei.liu2@citrix.com>,
"Suravee Suthikulpanit" <suravee.suthikulpanit@amd.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Julien Grall" <julien.grall@arm.com>,
"Paul Durrant" <paul.durrant@citrix.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Brian Woods" <brian.woods@amd.com>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH 3/5] iommu: move iommu_get_ops() into common code
Date: Wed, 8 May 2019 14:24:01 +0100 [thread overview]
Message-ID: <20190508132403.1454-4-paul.durrant@citrix.com> (raw)
Message-ID: <20190508132401.JAbNZzOXPfc4gGPfaMMbXUqbrlG5JcvGr2jLEckH_2g@z> (raw)
In-Reply-To: <20190508132403.1454-1-paul.durrant@citrix.com>
Currently x86 and ARM differ in their implementation for no good reason.
This patch moves the ARM variant of iommu_get/set_ops() helpers into
common code and modifies them so they deal with the __initconstrel
ops structures used by the x86 IOMMU vendor implementations (adding
__initconstrel to the SMMU code to bring it in line). Consequently, a lack
of init() method is now taken to mean uninitialized iommu_ops. Also, the
printk warning in iommu_set_ops() now becomes an ASSERT.
NOTE: This patch also gets rid of the extern intel_iommu_ops as it is
no longer necessary.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc: Brian Woods <brian.woods@amd.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: "Roger Pau Monné" <roger.pau@citrix.com>
---
xen/drivers/passthrough/arm/iommu.c | 17 -----------------
xen/drivers/passthrough/arm/smmu.c | 2 +-
xen/drivers/passthrough/iommu.c | 15 +++++++++++++++
xen/drivers/passthrough/vtd/extern.h | 1 -
xen/drivers/passthrough/vtd/iommu.c | 4 ++--
xen/drivers/passthrough/x86/iommu.c | 16 +++++++---------
xen/include/asm-arm/iommu.h | 3 ---
xen/include/asm-x86/iommu.h | 20 ++++++++------------
xen/include/xen/iommu.h | 3 +++
9 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/xen/drivers/passthrough/arm/iommu.c b/xen/drivers/passthrough/arm/iommu.c
index 325997b19f..c226ed18e3 100644
--- a/xen/drivers/passthrough/arm/iommu.c
+++ b/xen/drivers/passthrough/arm/iommu.c
@@ -20,23 +20,6 @@
#include <xen/device_tree.h>
#include <asm/device.h>
-static const struct iommu_ops *iommu_ops;
-
-const struct iommu_ops *iommu_get_ops(void)
-{
- return iommu_ops;
-}
-
-void __init iommu_set_ops(const struct iommu_ops *ops)
-{
- BUG_ON(ops == NULL);
-
- if ( iommu_ops && iommu_ops != ops )
- printk("WARNING: Cannot set IOMMU ops, already set to a different value\n");
-
- iommu_ops = ops;
-}
-
int __init iommu_hardware_setup(void)
{
struct dt_device_node *np;
diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c
index f151b9f5b5..f01061a218 100644
--- a/xen/drivers/passthrough/arm/smmu.c
+++ b/xen/drivers/passthrough/arm/smmu.c
@@ -1989,7 +1989,7 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain,
}
}
-static const struct iommu_ops arm_smmu_ops = {
+static const struct iommu_ops __initconstrel arm_smmu_ops = {
.capable = arm_smmu_capable,
.domain_init = arm_smmu_domain_init,
.domain_destroy = arm_smmu_domain_destroy,
diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
index b453b32191..d3a6199b77 100644
--- a/xen/drivers/passthrough/iommu.c
+++ b/xen/drivers/passthrough/iommu.c
@@ -21,6 +21,21 @@
#include <xen/keyhandler.h>
#include <xsm/xsm.h>
+static struct iommu_ops __read_mostly iommu_ops;
+
+const struct iommu_ops *iommu_get_ops(void)
+{
+ return &iommu_ops;
+}
+
+void __init iommu_set_ops(const struct iommu_ops *ops)
+{
+ BUG_ON(!ops);
+
+ ASSERT(!iommu_ops.init || iommu_ops.init == ops->init);
+ iommu_ops = *ops;
+}
+
static void iommu_dump_p2m_table(unsigned char key);
unsigned int __read_mostly iommu_dev_iotlb_timeout = 1000;
diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h
index 331d6e64f7..0ae5ddf6d0 100644
--- a/xen/drivers/passthrough/vtd/extern.h
+++ b/xen/drivers/passthrough/vtd/extern.h
@@ -28,7 +28,6 @@
struct pci_ats_dev;
extern bool_t rwbf_quirk;
extern const struct iommu_init_ops intel_iommu_init_ops;
-extern const struct iommu_ops intel_iommu_ops;
void print_iommu_regs(struct acpi_drhd_unit *drhd);
void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn);
diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index f9c76f594c..db77655260 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -2700,7 +2700,7 @@ static void vtd_dump_p2m_table(struct domain *d)
vtd_dump_p2m_table_level(hd->arch.pgd_maddr, agaw_to_level(hd->arch.agaw), 0, 0);
}
-const struct iommu_ops __initconstrel intel_iommu_ops = {
+static const struct iommu_ops __initconstrel _iommu_ops = {
.init = intel_iommu_domain_init,
.hwdom_init = intel_iommu_hwdom_init,
.add_device = intel_iommu_add_device,
@@ -2733,7 +2733,7 @@ const struct iommu_ops __initconstrel intel_iommu_ops = {
};
const struct iommu_init_ops __initconstrel intel_iommu_init_ops = {
- .ops = &intel_iommu_ops,
+ .ops = &_iommu_ops,
.setup = vtd_setup,
.supports_x2apic = intel_iommu_supports_eim,
};
diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c
index 895c7fb564..d9eaf1e62b 100644
--- a/xen/drivers/passthrough/x86/iommu.c
+++ b/xen/drivers/passthrough/x86/iommu.c
@@ -24,7 +24,6 @@
#include <asm/setup.h>
const struct iommu_init_ops *__initdata iommu_init_ops;
-struct iommu_ops __read_mostly iommu_ops;
int __init iommu_hardware_setup(void)
{
@@ -33,11 +32,7 @@ int __init iommu_hardware_setup(void)
if ( !iommu_init_ops )
return -ENODEV;
- if ( !iommu_ops.init )
- iommu_ops = *iommu_init_ops->ops;
- else
- /* x2apic setup may have previously initialised the struct. */
- ASSERT(iommu_ops.init == iommu_init_ops->ops->init);
+ iommu_set_ops(iommu_init_ops->ops);
rc = iommu_init_ops->setup();
@@ -49,20 +44,23 @@ int __init iommu_hardware_setup(void)
int iommu_enable_x2apic(void)
{
+ const struct iommu_ops *ops;
+
if ( system_state < SYS_STATE_active )
{
if ( !iommu_supports_x2apic() )
return -EOPNOTSUPP;
- iommu_ops = *iommu_init_ops->ops;
+ iommu_set_ops(iommu_init_ops->ops);
}
else if ( !x2apic_enabled )
return -EOPNOTSUPP;
- if ( !iommu_ops.enable_x2apic )
+ ops = iommu_get_ops();
+ if ( !ops->enable_x2apic )
return -EOPNOTSUPP;
- return iommu_ops.enable_x2apic();
+ return ops->enable_x2apic();
}
void iommu_update_ire_from_apic(
diff --git a/xen/include/asm-arm/iommu.h b/xen/include/asm-arm/iommu.h
index 904c9aec11..fb4ca23b69 100644
--- a/xen/include/asm-arm/iommu.h
+++ b/xen/include/asm-arm/iommu.h
@@ -23,9 +23,6 @@ struct arch_iommu
/* Always share P2M Table between the CPU and the IOMMU */
#define iommu_use_hap_pt(d) (has_iommu_pt(d))
-const struct iommu_ops *iommu_get_ops(void);
-void iommu_set_ops(const struct iommu_ops *ops);
-
#endif /* __ARCH_ARM_IOMMU_H__ */
/*
diff --git a/xen/include/asm-x86/iommu.h b/xen/include/asm-x86/iommu.h
index bbdb05f5f0..2d8716d673 100644
--- a/xen/include/asm-x86/iommu.h
+++ b/xen/include/asm-x86/iommu.h
@@ -57,14 +57,6 @@ struct arch_iommu
struct guest_iommu *g_iommu;
};
-extern struct iommu_ops iommu_ops;
-
-static inline const struct iommu_ops *iommu_get_ops(void)
-{
- BUG_ON(!iommu_ops.init);
- return &iommu_ops;
-}
-
struct iommu_init_ops {
const struct iommu_ops *ops;
int (*setup)(void);
@@ -83,8 +75,10 @@ int iommu_setup_hpet_msi(struct msi_desc *);
static inline int iommu_adjust_irq_affinities(void)
{
- return iommu_ops.adjust_irq_affinities
- ? iommu_ops.adjust_irq_affinities()
+ const struct iommu_ops *ops = iommu_get_ops();
+
+ return ops->adjust_irq_affinities
+ ? ops->adjust_irq_affinities()
: 0;
}
@@ -103,8 +97,10 @@ int iommu_enable_x2apic(void);
static inline void iommu_disable_x2apic(void)
{
- if ( x2apic_enabled && iommu_ops.disable_x2apic )
- iommu_ops.disable_x2apic();
+ const struct iommu_ops *ops = iommu_get_ops();
+
+ if ( x2apic_enabled && ops->disable_x2apic )
+ ops->disable_x2apic();
}
extern bool untrusted_msi;
diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index 5d3c1619c4..b2d429a6ef 100644
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -64,6 +64,9 @@ extern int8_t iommu_hwdom_reserved;
extern unsigned int iommu_dev_iotlb_timeout;
+const struct iommu_ops *iommu_get_ops(void);
+void iommu_set_ops(const struct iommu_ops *ops);
+
int iommu_setup(void);
int iommu_hardware_setup(void);
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-05-08 13:24 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-08 13:23 [PATCH 0/5] iommu groups + cleanup Paul Durrant
2019-05-08 13:23 ` [Xen-devel] " Paul Durrant
2019-05-08 13:23 ` [PATCH 1/5] iommu: trivial re-organisation to avoid unnecessary test Paul Durrant
2019-05-08 13:23 ` [Xen-devel] " Paul Durrant
2019-05-13 15:22 ` Jan Beulich
2019-05-13 15:22 ` [Xen-devel] " Jan Beulich
2019-05-08 13:24 ` [PATCH 2/5] iommu / x86: move call to scan_pci_devices() out of vendor code Paul Durrant
2019-05-08 13:24 ` [Xen-devel] " Paul Durrant
2019-05-13 15:35 ` Jan Beulich
2019-05-13 15:35 ` [Xen-devel] " Jan Beulich
2019-05-14 16:13 ` Paul Durrant
2019-05-14 16:13 ` [Xen-devel] " Paul Durrant
2019-05-15 6:29 ` Jan Beulich
2019-05-15 6:29 ` [Xen-devel] " Jan Beulich
2019-05-08 13:24 ` Paul Durrant [this message]
2019-05-08 13:24 ` [Xen-devel] [PATCH 3/5] iommu: move iommu_get_ops() into common code Paul Durrant
2019-05-13 16:11 ` Jan Beulich
2019-05-13 16:11 ` [Xen-devel] " Jan Beulich
2019-05-14 16:19 ` Paul Durrant
2019-05-14 16:19 ` [Xen-devel] " Paul Durrant
2019-05-14 21:36 ` Julien Grall
2019-05-14 21:36 ` [Xen-devel] " Julien Grall
2019-05-15 6:32 ` Jan Beulich
2019-05-15 6:32 ` [Xen-devel] " Jan Beulich
2019-05-08 13:24 ` [PATCH 4/5] iommu: introduce iommu_groups Paul Durrant
2019-05-08 13:24 ` [Xen-devel] " Paul Durrant
2019-05-15 8:44 ` Roger Pau Monné
2019-05-15 8:44 ` [Xen-devel] " Roger Pau Monné
2019-05-31 13:48 ` Paul Durrant
2019-05-31 13:48 ` [Xen-devel] " Paul Durrant
2019-05-15 14:17 ` Jan Beulich
2019-05-15 14:17 ` [Xen-devel] " Jan Beulich
2019-05-31 13:55 ` Paul Durrant
2019-05-31 13:55 ` [Xen-devel] " Paul Durrant
2019-05-31 14:13 ` Jan Beulich
2019-05-31 14:13 ` [Xen-devel] " Jan Beulich
2019-05-31 14:21 ` Paul Durrant
2019-05-31 14:21 ` [Xen-devel] " Paul Durrant
2019-05-15 14:24 ` Jan Beulich
2019-05-15 14:24 ` [Xen-devel] " Jan Beulich
2019-05-08 13:24 ` [PATCH 5/5] iommu / pci: re-implement XEN_DOMCTL_get_device_group Paul Durrant
2019-05-08 13:24 ` [Xen-devel] " Paul Durrant
2019-05-15 9:06 ` Roger Pau Monné
2019-05-15 9:06 ` [Xen-devel] " Roger Pau Monné
2019-06-03 9:58 ` Paul Durrant
2019-06-03 9:58 ` [Xen-devel] " Paul Durrant
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=20190508132403.1454-4-paul.durrant@citrix.com \
--to=paul.durrant@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=brian.woods@amd.com \
--cc=jbeulich@suse.com \
--cc=julien.grall@arm.com \
--cc=kevin.tian@intel.com \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=suravee.suthikulpanit@amd.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/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).