iommu: Clean up cookie and sw_msi in struct iommu_domain
Subsystems (3)
v5 cover iommu: Clean up cookie and sw_msi in struct iommu_domain
A few things in iommu_domain structure (such as iova_cookie, iommufd_hwpt, fault handler, and etc) are exclusive to certain types of iommu_domains. So, all of them can be seen as domain cookies in different cookie types.
Furthermore, iova_cookie is shared with the msi_cookie use case. It could be cleaner by decoupling these too.
Define an enum iommu_domain_cookie_type to fit all those cookies in.
Since there are only two sw_msi implementations, check domain->cookie_type in iommu_dma_prepare_msi() to call the corresponding sw_msi function.
This is a clean-up series for the previous sw_msi Part-1 core series. It's on github:
https://github.com/nicolinc/iommufd/commits/iommufd_msi_cleanup-v5
Changelog
v5
* Add IMPORT line for IOMMUFD_INTERNAL and change IOMMUFD_DRIVER_CORE to a "bool" module, fixing build module errors reported by Arnd:
https://lore.kernel.org/all/[email protected]/
* In iommu_dma_prepare_msi(), let all IDENTITY DOMAINs pass through, fixing the regression with IDENTITY domains reported by Nathan:
https://lore.kernel.org/linux-iommu/20250324162558.GA198799@ax162/
v4
https://lore.kernel.org/all/[email protected]/
* Rebase on top of a bug fix for hwpt_iommufd cookie
https://lore.kernel.org/all/[email protected]/
* Add Reviewed-by from Robin and Kevin
* Add missing "break;" in iommu_domain_free()
* Drop "linux/msi.h" header from the iommufd/device code
* Set iommufd_sw_msi_install's SYMBOL to "IOMMUFD_INTERNAL"
* Update commit messages for typo fixing and size comparison
* Add a local msi_page_list to cache cookie_msi_pages(domain) return
* Add an inline iommufd_group_setup_msi() for !CONFIG_IRQ_MSI_IOMMU
v3
https://lore.kernel.org/all/[email protected]/
* Integrate Robin's patch
https://lore.kernel.org/linux-iommu/4e68d5820be06adc1b34fc0d1c9399481151daee.1740742271.git.robin.murphy@arm.com/
replacing private_data_owner with the new cookie_type
* Move iommu_sw_msi stub from the public header to iommu-priv.h
v2
https://lore.kernel.org/all/[email protected]/
* Drop sw_msi function pointer
* Add a new private_data_owner tag in iommu_domain
* Let iommu core call the two sw_msi implementations directly
v1
https://lore.kernel.org/all/[email protected]/
Thanks
Nicolin
Nicolin Chen (2):
iommufd: Move iommufd_sw_msi and related functions to driver.c
iommu: Drop sw_msi from iommu_domain
Robin Murphy (1):
iommu: Sort out domain user data
drivers/iommu/iommufd/Kconfig | 2 +- drivers/iommu/dma-iommu.h | 14 ++ drivers/iommu/iommu-priv.h | 13 ++ drivers/iommu/iommufd/iommufd_private.h | 7 +- include/linux/iommu.h | 35 ++-- drivers/iommu/dma-iommu.c | 208 ++++++++++++------------ drivers/iommu/iommu-sva.c | 1 + drivers/iommu/iommu.c | 36 +++- drivers/iommu/iommufd/device.c | 131 +-------------- drivers/iommu/iommufd/driver.c | 126 ++++++++++++++ drivers/iommu/iommufd/hw_pagetable.c | 6 +- 11 files changed, 323 insertions(+), 256 deletions(-)
base-commit: da0c56520e880441d0503d0cf0d6853dcfb5f1a4
Signature · 1 line
2.43.0
PATCH v5 2/3 iommufd: Move iommufd_sw_msi and related functions to driver.c
To provide the iommufd_sw_msi() to the iommu core that is under a different Kconfig, move it and its related functions to driver.c. Then, stub it into the iommu-priv header. The iommufd_sw_msi_install() continues to be used by iommufd internal, so put it in the private header.
Note that iommufd_sw_msi() will be called in the iommu core, replacing the sw_msi function pointer. Given that IOMMU_API is "bool" in Kconfig, change IOMMUFD_DRIVER_CORE to "bool" as well.
Since this affects the module size, here is before-n-after size comparison:
[Before]
text data bss dec hex filename
18797 848 56 19701 4cf5 drivers/iommu/iommufd/device.o
722 44 0 766 2fe drivers/iommu/iommufd/driver.o
[After]
text data bss dec hex filename
17735 808 56 18599 48a7 drivers/iommu/iommufd/device.o
3020 180 0 3200 c80 drivers/iommu/iommufd/driver.o
--- drivers/iommu/iommufd/Kconfig | 2 +- drivers/iommu/iommu-priv.h | 13 +++ drivers/iommu/iommufd/iommufd_private.h | 7 +- drivers/iommu/iommufd/device.c | 131 ++---------------------- drivers/iommu/iommufd/driver.c | 126 +++++++++++++++++++++++ 5 files changed, 153 insertions(+), 126 deletions(-)
drivers/iommu/iommufd/Kconfig +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only config IOMMUFD_DRIVER_CORE - tristate + bool default (IOMMUFD_DRIVER || IOMMUFD) if IOMMUFD!=n config IOMMUFD
drivers/iommu/iommu-priv.h +13 -0
@@ -5,6 +5,7 @@#define __LINUX_IOMMU_PRIV_H#include <linux/iommu.h> +#include <linux/msi.h> static inline const struct iommu_ops *dev_iommu_ops (struct device *dev) {
@@ -43,4 +44,16 @@ void iommu_detach_group_handle(struct iommu_domain *domain,int iommu_replace_group_handle (struct iommu_group *group,struct iommu_domain *new_domain,struct iommu_attach_handle *handle); + +#if IS_ENABLED (CONFIG_IOMMUFD_DRIVER_CORE ) &&IS_ENABLED (CONFIG_IRQ_MSI_IOMMU ) +int iommufd_sw_msi (struct iommu_domain *domain,struct msi_desc *desc, +phys_addr_t msi_addr); +#else /* !CONFIG_IOMMUFD_DRIVER_CORE || !CONFIG_IRQ_MSI_IOMMU */ +static inline int iommufd_sw_msi (struct iommu_domain *domain, +struct msi_desc *desc,phys_addr_t msi_addr) +{ +return -EOPNOTSUPP ; +} +#endif /* CONFIG_IOMMUFD_DRIVER_CORE && CONFIG_IRQ_MSI_IOMMU */ +#endif /* __LINUX_IOMMU_PRIV_H */
drivers/iommu/iommufd/iommufd_private.h +5 -2
@@ -32,8 +32,11 @@ struct iommufd_sw_msi_maps {DECLARE_BITMAP (bitmap,64 ); }; -int iommufd_sw_msi (struct iommu_domain *domain,struct msi_desc *desc, -phys_addr_t msi_addr); +#ifdef CONFIG_IRQ_MSI_IOMMU +int iommufd_sw_msi_install (struct iommufd_ctx *ictx, +struct iommufd_hwpt_paging *hwpt_paging, +struct iommufd_sw_msi_map *msi_map); +#endif struct iommufd_ctx {struct file *file;
drivers/iommu/iommufd/device.c +8 -123
150 lines not on this page · raw message
drivers/iommu/iommufd/driver.c +126 -0
131 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v5 1/3 iommu: Sort out domain user data
In reply to Nicolin ChenFrom: Robin Murphy <[email protected]>
When DMA/MSI cookies were made first-class citizens back in commit 46983fcd67ac ("iommu: Pull IOVA cookie management into the core"), there was no real need to further expose the two different cookie types. However, now that IOMMUFD wants to add a third type of MSI-mapping cookie, we do have a nicely compelling reason to properly dismabiguate things at the domain level beyond just vaguely guessing from the domain type.
Meanwhile, we also effectively have another "cookie" in the form of the anonymous union for other user data, which isn't much better in terms of being vague and unenforced. The fact is that all these cookie types are mutually exclusive, in the sense that combining them makes zero sense and/or would be catastrophic (iommu_set_fault_handler() on an SVA domain, anyone?) - the only combination which *might* be reasonable is perhaps a fault handler and an MSI cookie, but nobody's doing that at the moment, so let's rule it out as well for the sake of being clear and robust. To that end, we pull DMA and MSI cookies apart a little more, mostly to clear up the ambiguity at domain teardown, then for clarity (and to save a little space), move them into the union, whose ownership we can then properly describe and enforce entirely unambiguously.
[nicolinc: rebase on latest tree; use prefix IOMMU_COOKIE_; merge unions
in iommu_domain; add IOMMU_COOKIE_IOMMUFD for iommufd_hwpt]
--- drivers/iommu/dma-iommu.h | 5 + include/linux/iommu.h | 20 ++- drivers/iommu/dma-iommu.c | 194 ++++++++++++++------------- drivers/iommu/iommu-sva.c | 1 + drivers/iommu/iommu.c | 18 ++- drivers/iommu/iommufd/hw_pagetable.c | 3 + 6 files changed, 143 insertions(+), 98 deletions(-)
drivers/iommu/dma-iommu.h +5 -0
@@ -13,6 +13,7 @@ void iommu_setup_dma_ops(struct device *dev);int iommu_get_dma_cookie (struct iommu_domain *domain);void iommu_put_dma_cookie (struct iommu_domain *domain); +void iommu_put_msi_cookie (struct iommu_domain *domain);int iommu_dma_init_fq (struct iommu_domain *domain);
@@ -40,6 +41,10 @@ static inline void iommu_put_dma_cookie(struct iommu_domain *domain) { } +static inline void iommu_put_msi_cookie (struct iommu_domain *domain) +{ +} +static inline void iommu_dma_get_resv_regions (struct device *dev,struct list_head *list) { }
include/linux/iommu.h +15 -5
@@ -41,6 +41,7 @@ struct iommu_dirty_ops;struct notifier_block ;struct iommu_sva ;struct iommu_dma_cookie ; +struct iommu_dma_msi_cookie ;struct iommu_fault_param ;struct iommufd_ctx ;struct iommufd_viommu ;
@@ -165,6 +166,15 @@ struct iommu_domain_geometry {bool force_aperture;/* DMA only allowed in mappable range? */ }; +enum iommu_domain_cookie_type { +IOMMU_COOKIE_NONE , +IOMMU_COOKIE_DMA_IOVA , +IOMMU_COOKIE_DMA_MSI , +IOMMU_COOKIE_FAULT_HANDLER , +IOMMU_COOKIE_SVA , +IOMMU_COOKIE_IOMMUFD , +}; +/* Domain feature flags */ #define __IOMMU_DOMAIN_PAGING (1U << 0)/* Support for iommu_map/unmap */ #define __IOMMU_DOMAIN_DMA_API (1U << 1)/* Domain for use in DMA-API
@@ -211,12 +221,12 @@ struct iommu_domain_geometry {struct iommu_domain {unsigned type; +enum iommu_domain_cookie_type cookie_type;const struct iommu_domain_ops *ops;const struct iommu_dirty_ops *dirty_ops;const struct iommu_ops *owner;/* Whose domain_alloc we came from */ unsigned long pgsize_bitmap;/* Bitmap of page sizes in use */ struct iommu_domain_geometry geometry; -struct iommu_dma_cookie *iova_cookie;int (*iopf_handler)(struct iopf_group *group);#if IS_ENABLED (CONFIG_IRQ_MSI_IOMMU )
@@ -224,10 +234,10 @@ struct iommu_domain { phys_addr_t msi_addr);#endif -union {/* Pointer usable by owner of the domain */ -struct iommufd_hw_pagetable *iommufd_hwpt;/* iommufd */ - }; - union { /* Fault handler */ +union {/* cookie */ +struct iommu_dma_cookie *iova_cookie; +struct iommu_dma_msi_cookie *msi_cookie; +struct iommufd_hw_pagetable *iommufd_hwpt;struct {iommu_fault_handler_t handler;void *handler_token;
drivers/iommu/dma-iommu.c +104 -90
343 lines not on this page · raw message
drivers/iommu/iommu-sva.c +1 -0
@@ -310,6 +310,7 @@ static struct iommu_domain *iommu_sva_domain_alloc(struct device *dev, } domain->type =IOMMU_DOMAIN_SVA ; + domain->cookie_type =IOMMU_COOKIE_SVA ;mmgrab (mm); domain->mm = mm; domain->owner = ops;
drivers/iommu/iommu.c +15 -3
@@ -1953,8 +1953,10 @@ void iommu_set_fault_handler(struct iommu_domain *domain, iommu_fault_handler_t handler, void *token) { - BUG_ON(!domain); +if (WARN_ON (!domain || domain->cookie_type !=IOMMU_COOKIE_NONE )) +return ; + domain->cookie_type =IOMMU_COOKIE_FAULT_HANDLER ; domain->handler = handler; domain->handler_token = token; }
@@ -2024,9 +2026,19 @@ EXPORT_SYMBOL_GPL(iommu_paging_domain_alloc_flags);void iommu_domain_free (struct iommu_domain *domain) { -if (domain->type ==IOMMU_DOMAIN_SVA ) +switch (domain->cookie_type) { +case IOMMU_COOKIE_DMA_IOVA : +iommu_put_dma_cookie (domain); +break ; +case IOMMU_COOKIE_DMA_MSI : +iommu_put_msi_cookie (domain); +break ; +case IOMMU_COOKIE_SVA :mmdrop (domain->mm); -iommu_put_dma_cookie (domain); +break ; +default : +break ; + }if (domain->ops->free) domain->ops->free (domain); }
drivers/iommu/iommufd/hw_pagetable.c +3 -0
@@ -160,6 +160,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, } } hwpt->domain->iommufd_hwpt = hwpt; + hwpt->domain->cookie_type =IOMMU_COOKIE_IOMMUFD ;iommu_domain_set_sw_msi (hwpt->domain, iommufd_sw_msi);/*
@@ -257,6 +258,7 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx, } hwpt->domain->owner = ops; hwpt->domain->iommufd_hwpt = hwpt; + hwpt->domain->cookie_type =IOMMU_COOKIE_IOMMUFD ;iommu_domain_set_sw_msi (hwpt->domain, iommufd_sw_msi);if (WARN_ON_ONCE (hwpt->domain->type !=IOMMU_DOMAIN_NESTED )) {
@@ -315,6 +317,7 @@ iommufd_viommu_alloc_hwpt_nested(struct iommufd_viommu *viommu, u32 flags, } hwpt->domain->iommufd_hwpt = hwpt; hwpt->domain->owner = viommu->iommu_dev->ops; + hwpt->domain->cookie_type =IOMMU_COOKIE_IOMMUFD ;iommu_domain_set_sw_msi (hwpt->domain, iommufd_sw_msi);if (WARN_ON_ONCE (hwpt->domain->type !=IOMMU_DOMAIN_NESTED )) {
Signature · 1 line
2.43.0
PATCH v5 3/3 iommu: Drop sw_msi from iommu_domain
In reply to Nicolin ChenThere are only two sw_msi implementations in the entire system, thus it's not very necessary to have an sw_msi pointer.
Instead, check domain->cookie_type to call the two sw_msi implementations directly from the core code.
--- drivers/iommu/dma-iommu.h | 9 +++++++++ include/linux/iommu.h | 15 --------------- drivers/iommu/dma-iommu.c | 14 ++------------ drivers/iommu/iommu.c | 18 ++++++++++++++++-- drivers/iommu/iommufd/hw_pagetable.c | 3 --- 5 files changed, 27 insertions(+), 32 deletions(-)
drivers/iommu/dma-iommu.h +9 -0
@@ -19,6 +19,9 @@ int iommu_dma_init_fq(struct iommu_domain *domain);void iommu_dma_get_resv_regions (struct device *dev,struct list_head *list); +int iommu_dma_sw_msi (struct iommu_domain *domain,struct msi_desc *desc, +phys_addr_t msi_addr); +extern bool iommu_dma_forcedac;#else /* CONFIG_IOMMU_DMA */
@@ -49,5 +52,11 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he { } +static inline int iommu_dma_sw_msi (struct iommu_domain *domain, +struct msi_desc *desc,phys_addr_t msi_addr) +{ +return -ENODEV ; +} +#endif /* CONFIG_IOMMU_DMA */ #endif /* __DMA_IOMMU_H */
include/linux/iommu.h +0 -15
@@ -229,11 +229,6 @@ struct iommu_domain {struct iommu_domain_geometry geometry;int (*iopf_handler)(struct iopf_group *group); -#if IS_ENABLED (CONFIG_IRQ_MSI_IOMMU ) -int (*sw_msi)(struct iommu_domain *domain,struct msi_desc *desc, -phys_addr_t msi_addr); -#endif -union {/* cookie */ struct iommu_dma_cookie *iova_cookie;struct iommu_dma_msi_cookie *msi_cookie;
@@ -254,16 +249,6 @@ struct iommu_domain { }; }; -static inline void iommu_domain_set_sw_msi ( -struct iommu_domain *domain, -int (*sw_msi)(struct iommu_domain *domain,struct msi_desc *desc, -phys_addr_t msi_addr)) -{ -#if IS_ENABLED (CONFIG_IRQ_MSI_IOMMU ) - domain->sw_msi = sw_msi; -#endif -} -static inline bool iommu_is_dma_domain (struct iommu_domain *domain) {return domain->type & __IOMMU_DOMAIN_DMA_API;
drivers/iommu/dma-iommu.c +2 -12
@@ -94,9 +94,6 @@ static int __init iommu_dma_forcedac_setup(char *str) }early_param ("iommu.forcedac" , iommu_dma_forcedac_setup); -static int iommu_dma_sw_msi (struct iommu_domain *domain,struct msi_desc *desc, -phys_addr_t msi_addr); -/* Number of entries per flush queue */ #define IOVA_DEFAULT_FQ_SIZE 256#define IOVA_SINGLE_FQ_SIZE 32768
@@ -377,7 +374,6 @@ int iommu_get_dma_cookie(struct iommu_domain *domain)mutex_init (&cookie->mutex);INIT_LIST_HEAD (&cookie->msi_page_list); -iommu_domain_set_sw_msi (domain, iommu_dma_sw_msi); domain->cookie_type =IOMMU_COOKIE_DMA_IOVA ; domain->iova_cookie = cookie;return 0 ;
@@ -411,7 +407,6 @@ int iommu_get_msi_cookie(struct iommu_domain *domain, dma_addr_t base) cookie->msi_iova = base;INIT_LIST_HEAD (&cookie->msi_page_list); -iommu_domain_set_sw_msi (domain, iommu_dma_sw_msi); domain->cookie_type =IOMMU_COOKIE_DMA_MSI ; domain->msi_cookie = cookie;return 0 ;
@@ -427,11 +422,6 @@ void iommu_put_dma_cookie(struct iommu_domain *domain)struct iommu_dma_cookie *cookie = domain->iova_cookie;struct iommu_dma_msi_page *msi, *tmp; -#if IS_ENABLED (CONFIG_IRQ_MSI_IOMMU ) -if (domain->sw_msi != iommu_dma_sw_msi) -return ; -#endif -if (cookie->iovad.granule) {iommu_dma_free_fq (cookie);put_iova_domain (&cookie->iovad);
@@ -1826,8 +1816,8 @@ static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev,return NULL ; } -static int iommu_dma_sw_msi (struct iommu_domain *domain,struct msi_desc *desc, -phys_addr_t msi_addr) +int iommu_dma_sw_msi (struct iommu_domain *domain,struct msi_desc *desc, +phys_addr_t msi_addr) {struct device *dev =msi_desc_to_dev (desc);const struct iommu_dma_msi_page *msi_page;
drivers/iommu/iommu.c +16 -2
@@ -18,6 +18,7 @@#include <linux/errno.h> #include <linux/host1x_context_bus.h> #include <linux/iommu.h> +#include <linux/iommufd.h> #include <linux/idr.h> #include <linux/err.h> #include <linux/pci.h>
@@ -3650,8 +3651,21 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)return 0 ;mutex_lock (&group->mutex); -if (group->domain && group->domain->sw_msi) - ret = group->domain->sw_msi (group->domain, desc, msi_addr); +/* An IDENTITY domain must pass through */ +if (group->domain && group->domain->type !=IOMMU_DOMAIN_IDENTITY ) { +switch (group->domain->cookie_type) { +case IOMMU_COOKIE_DMA_MSI : +case IOMMU_COOKIE_DMA_IOVA : + ret =iommu_dma_sw_msi (group->domain, desc, msi_addr); +break ; +case IOMMU_COOKIE_IOMMUFD : + ret =iommufd_sw_msi (group->domain, desc, msi_addr); +break ; +default : + ret = -EOPNOTSUPP ; +break ; + } + }mutex_unlock (&group->mutex);return ret; }
drivers/iommu/iommufd/hw_pagetable.c +0 -3
@@ -161,7 +161,6 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, } hwpt->domain->iommufd_hwpt = hwpt; hwpt->domain->cookie_type =IOMMU_COOKIE_IOMMUFD ; -iommu_domain_set_sw_msi (hwpt->domain, iommufd_sw_msi);/* * Set the coherency mode before we do iopt_table_add_domain() as some
@@ -259,7 +258,6 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx, hwpt->domain->owner = ops; hwpt->domain->iommufd_hwpt = hwpt; hwpt->domain->cookie_type =IOMMU_COOKIE_IOMMUFD ; -iommu_domain_set_sw_msi (hwpt->domain, iommufd_sw_msi);if (WARN_ON_ONCE (hwpt->domain->type !=IOMMU_DOMAIN_NESTED )) { rc = -EINVAL ;
@@ -318,7 +316,6 @@ iommufd_viommu_alloc_hwpt_nested(struct iommufd_viommu *viommu, u32 flags, hwpt->domain->iommufd_hwpt = hwpt; hwpt->domain->owner = viommu->iommu_dev->ops; hwpt->domain->cookie_type =IOMMU_COOKIE_IOMMUFD ; -iommu_domain_set_sw_msi (hwpt->domain, iommufd_sw_msi);if (WARN_ON_ONCE (hwpt->domain->type !=IOMMU_DOMAIN_NESTED )) { rc = -EINVAL ;
Signature · 1 line
2.43.0
Quoted 8 lines · Nicolin Chen
This is a clean-up series for the previous
sw_msiPart-1 core series. It's on github:
https://github.com/nicolinc/iommufd/commits/iommufd_msi_cleanup-v5Changelog
v5
* Add IMPORT line forIOMMUFD_INTERNALand changeIOMMUFD_DRIVER_COREto a "bool" module, fixing build module errors reported by Arnd:
Quoted 6 lines
https://lore.kernel.org/all/[email protected]/ * In iommu_dma_prepare_msi(), let all IDENTITY DOMAINs pass through, fixing the regression with IDENTITY domains reported by Nathan: https://lore.kernel.org/linux-iommu/20250324162558.GA198799@ax162/base-commit:
da0c56520e880441d0503d0cf0d6853dcfb5f1a4
Hi Jason,
Assuming that you want to replace the commits in your for-next tree with these patches, I rebased them on this commit:da0c56520e88 iommu/arm-smmu-v3: Set MEV bit in nested STE for DoS mitigations
Again, sorry for the trouble.
Nicolin
P.S. Attaching git-diff against the current commit in your tree "git diff -U1 e009e088d88e8..nicolinc/iommufd_msi_cleanup-v5":
drivers/iommu/iommu.c +2 -1
@@ -3653,3 +3653,4 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)mutex_lock (&group->mutex); -if (group->domain) { +/* An IDENTITY domain must pass through */ +if (group->domain && group->domain->type !=IOMMU_DOMAIN_IDENTITY ) {switch (group->domain->cookie_type) {
drivers/iommu/iommufd/Kconfig +1 -1
@@ -2,3 +2,3 @@ config IOMMUFD_DRIVER_CORE - tristate + bool default (IOMMUFD_DRIVER || IOMMUFD) if IOMMUFD!=n
drivers/iommu/iommufd/driver.c +1 -0
@@ -249,2 +249,3 @@ EXPORT_SYMBOL_NS_GPL(iommufd_sw_msi, "IOMMUFD");MODULE_DESCRIPTION ("iommufd code shared with builtin modules" ); +MODULE_IMPORT_NS ("IOMMUFD_INTERNAL" );MODULE_LICENSE ("GPL" );
Jason Gunthorpe
maintainerQuoted 16 lines · Nicolin Chen
Quoted 8 lines · Nicolin Chen
This is a clean-up series for the previous
sw_msiPart-1 core series. It's on github:
https://github.com/nicolinc/iommufd/commits/iommufd_msi_cleanup-v5Changelog
v5
* Add IMPORT line forIOMMUFD_INTERNALand changeIOMMUFD_DRIVER_COREto a "bool" module, fixing build module errors reported by Arnd:Quoted 6 lines
https://lore.kernel.org/all/[email protected]/ * In iommu_dma_prepare_msi(), let all IDENTITY DOMAINs pass through, fixing the regression with IDENTITY domains reported by Nathan: https://lore.kernel.org/linux-iommu/20250324162558.GA198799@ax162/base-commit:
da0c56520e880441d0503d0cf0d6853dcfb5f1a4
Quoted 7 lines
Hi Jason,
Assuming that you want to replace the commits in your for-next tree with these patches, I rebased them on this commit:
da0c56520e88iommu/arm-smmu-v3: Set MEV bit in nested STE for DoS mitigationsAgain, sorry for the trouble.
Can you post a v6 please? That is a bit easier
Thanks,
Jason
Jason Gunthorpe
maintainerQuoted 6 lines · Nicolin Chen
Nicolin Chen (2):
iommufd: Moveiommufd_sw_msiand related functions todriver.c
iommu: Dropsw_msifromiommu_domainRobin Murphy (1):
iommu: Sort out domain user data
Refreshed, thanks
Jason