iommufd: Add nesting infrastructure (part 1/2)
Subsystems (6)
v6 cover iommufd: Add nesting infrastructure (part 1/2)
Nested translation is a hardware feature that is supported by many modern IOMMU hardwares. It has two stages of address translations to get access to the physical address. A stage-1 translation table is owned by userspace (e.g. by a guest OS), while a stage-2 is owned by kernel. Any change to a stage-1 translation table should be followed by an IOTLB invalidation.
Take Intel VT-d as an example, the stage-1 translation table is guest I/O page table. As the below diagram shows, the guest I/O page table pointer in GPA (guest physical address) is passed to host and be used to perform a stage-1 translation. Along with it, a modification to present mappings in the guest I/O page table should be followed by an IOTLB invalidation.
.-------------. .---------------------------.
| vIOMMU | | Guest I/O page table |
| | '---------------------------' .----------------/
| PASID Entry |--- PASID cache flush --+
'-------------' |
| | V
| | I/O page table pointer in GPA
'-------------'
Guest
------| Shadow |---------------------------|--------
v v v
Host
.-------------. .------------------------.
| pIOMMU | | FS for GIOVA->GPA |
| | '------------------------'
.----------------/ |
| PASID Entry | V (Nested xlate)
'----------------\.----------------------------------.
| | | SS for GPA->HPA, unmanaged domain|
| | '----------------------------------'
'-------------'Where:
- FS = First stage page tables
- SS = Second stage page tables
<Intel VT-d Nested translation>
In IOMMUFD, all the translation tables are tracked by hw_pagetable (hwpt) and each hwpt is backed by an iommu_domain allocated from an iommu driver. So in this series hw_pagetable and iommu_domain means the same thing if no special note. IOMMUFD has already supported allocating hw_pagetable linked with an IOAS. However, a nesting case requires IOMMUFD to allow allocating hw_pagetable with driver specific parameters and interface to sync stage-1 IOTLB as user owns the stage-1 translation table.
This series is based on the iommu hw info reporting series [1] and nested parent domain allocation [2]. It first extends domain_alloc_user to allocate hwpt with user data by allowing the IOMMUFD internal infrastructure to accept user_data and parent hwpt, relaying the user_data/parent to the iommu core to allocate IOMMU_DOMAIN_NESTED. And it then extends the IOMMU_HWPT_ALLOC ioctl to accept user data and a parent hwpt ID.
Note that this series is the part-1 set of a two-part nesting series. It does not include the cache invalidation interface, which will be added in the part 2.
Complete code can be found in [3], it is on top of Joao's dirty page tracking v6 series and fix patches. QEMU could can be found in [4].
At last, this is a team work together with Nicolin Chen, Lu Baolu. Thanks them for the help. ^_^. Look forward to your feedbacks.
[1] https://lore.kernel.org/linux-iommu/[email protected]/#r - merged
[2] https://lore.kernel.org/linux-iommu/[email protected]/ - merged
[3] https://github.com/yiliu1765/iommufd/tree/iommufd_nesting
[4] https://github.com/yiliu1765/qemu/tree/zhenzhong/wip/iommufd_nesting_rfcv1
Change log:
v6:
- Rebase on top of Joao's dirty tracking series:
https://lore.kernel.org/linux-iommu/[email protected]/
- Rebase on top of the enforce_cache_coherency removal patch:
https://lore.kernel.org/linux-iommu/ZTcAhwYjjzqM0A5M@Asurada-Nvidia/
- Add parent and user_data check in iommu driver before the driver actually supports the two input. This can make better bisect support, the change is in patch 02.
v5: https://lore.kernel.org/linux-iommu/[email protected]/
- Split the iommufd nesting series into two parts of alloc_user and invalidation (Jason)
- Split IOMMUFD_OBJ_HW_PAGETABLE to IOMMUFD_OBJ_HWPT_PAGING/_NESTED, and do the same with the structures/alloc()/abort()/destroy(). Reworked the selftest accordingly too. (Jason)
- Move hwpt/data_type into struct iommu_user_data from standalone op arguments. (Jason)
- Rename hwpt_type to be data_type, the HWPT_TYPE to be HWPT_ALLOC_DATA, _TYPE_DEFAULT to be _ALLOC_DATA_NONE (Jason, Kevin)
- Rename iommu_copy_user_data() to iommu_copy_struct_from_user() (Kevin)
- Add macro to the iommu_copy_struct_from_user() to calculate min_size (Jason)
- Fix two bugs spotted by ZhaoYan
v4: https://lore.kernel.org/linux-iommu/[email protected]/
- Separate HWPT alloc/destroy/abort functions between user-managed HWPTs and kernel-managed HWPTs
- Rework invalidate uAPI to be a multi-request array-based design
- Add a struct iommu_user_data_array and a helper for driver to sanitize and copy the entry data from user space invalidation array
- Add a patch fixing TEST_LENGTH() in selftest program
- Drop IOMMU_RESV_IOVA_RANGES patches
- Update kdoc and inline comments
- Drop the code to add IOMMU_RESV_SW_MSI to kernel-managed HWPT in nested translation, this does not change the rule that resv regions should only be added to the kernel-managed HWPT. The IOMMU_RESV_SW_MSI stuff will be added in later series as it is needed only by SMMU so far.
v3: https://lore.kernel.org/linux-iommu/[email protected]/
- Add new uAPI things in alphabetical order
- Pass in "enum iommu_hwpt_type hwpt_type" to op->domain_alloc_user for sanity, replacing the previous op->domain_alloc_user_data_len solution
- Return ERR_PTR from domain_alloc_user instead of NULL
- Only add IOMMU_RESV_SW_MSI to kernel-managed HWPT in nested translation (Kevin)
- Add IOMMU_RESV_IOVA_RANGES to report resv iova ranges to userspace hence userspace is able to exclude the ranges in the stage-1 HWPT (e.g. guest I/O page table). (Kevin)
- Add selftest coverage for the new IOMMU_RESV_IOVA_RANGES ioctl
- Minor changes per Kevin's inputs
v2: https://lore.kernel.org/linux-iommu/[email protected]/
- Add union iommu_domain_user_data to include all user data structures to avoid passing void * in kernel APIs.
- Add iommu op to return user data length for user domain allocation
- Rename struct iommu_hwpt_alloc::data_type to be hwpt_type
- Store the invalidation data length in iommu_domain_ops::cache_invalidate_user_data_len
- Convert cache_invalidate_user op to be int instead of void
- Remove @data_type in struct iommu_hwpt_invalidate
- Remove out_hwpt_type_bitmap in struct iommu_hw_info hence drop patch 08 of v1
v1: https://lore.kernel.org/linux-iommu/[email protected]/
Thanks,
Yi Liu
Jason Gunthorpe (2):
iommufd: Rename IOMMUFD_OBJ_HW_PAGETABLE to IOMMUFD_OBJ_HWPT_PAGING iommufd/device: Wrap IOMMUFD_OBJ_HWPT_PAGING-only configurations
Lu Baolu (1):
iommu: Add IOMMU_DOMAIN_NESTED
Nicolin Chen (6):
iommufd: Derive iommufd_hwpt_paging from iommufd_hw_pagetable
iommufd: Share iommufd_hwpt_alloc with IOMMUFD_OBJ_HWPT_NESTED
iommufd: Add a nested HW pagetable object
iommu: Add iommu_copy_struct_from_user helper iommufd/selftest: Add nested domain allocation for mock domain iommufd/selftest: Add coverage for IOMMU_HWPT_ALLOC with nested HWPTs
Yi Liu (1):
iommu: Pass in parent domain with user_data to domain_alloc_user op
drivers/iommu/intel/iommu.c | 7 +- drivers/iommu/iommufd/device.c | 157 +++++++--- drivers/iommu/iommufd/hw_pagetable.c | 271 +++++++++++++----- drivers/iommu/iommufd/iommufd_private.h | 73 +++-- drivers/iommu/iommufd/iommufd_test.h | 18 ++ drivers/iommu/iommufd/main.c | 10 +- drivers/iommu/iommufd/selftest.c | 151 ++++++++-- drivers/iommu/iommufd/vfio_compat.c | 6 +- include/linux/iommu.h | 72 ++++- include/uapi/linux/iommufd.h | 31 +- tools/testing/selftests/iommu/iommufd.c | 120 ++++++++ .../selftests/iommu/iommufd_fail_nth.c | 3 +- tools/testing/selftests/iommu/iommufd_utils.h | 31 +- 13 files changed, 768 insertions(+), 182 deletions(-)
Signature · 1 line
2.34.1
PATCH v6 1/10 iommu: Add IOMMU_DOMAIN_NESTED
From: Lu Baolu <[email protected]>
Introduce a new domain type for a user I/O page table, which is nested on top of another user space address represented by a PAGING domain. This new domain can be allocated by the domain_alloc_user op, and attached to a device through the existing iommu_attach_device/group() interfaces.
The mappings of a nested domain are managed by user space software, so it is not necessary to have map/unmap callbacks.
--- include/linux/iommu.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/iommu.h +4 -0
@@ -67,6 +67,9 @@ struct iommu_domain_geometry {#define __IOMMU_DOMAIN_SVA (1U << 4)/* Shared process address space */ +#define __IOMMU_DOMAIN_NESTED (1U << 5)/* User-managed address space nested +on a stage-2 translation */ +#define IOMMU_DOMAIN_ALLOC_FLAGS ~__IOMMU_DOMAIN_DMA_FQ/* * This are the possible domain-types
@@ -93,6 +96,7 @@ struct iommu_domain_geometry { __IOMMU_DOMAIN_DMA_API | \ __IOMMU_DOMAIN_DMA_FQ)#define IOMMU_DOMAIN_SVA (__IOMMU_DOMAIN_SVA) +#define IOMMU_DOMAIN_NESTED (__IOMMU_DOMAIN_NESTED)struct iommu_domain {unsigned type;
Signature · 1 line
2.34.1
PATCH v6 2/10 iommu: Pass in parent domain with user_data to domain_alloc_user op
In reply to Yi Liudomain_alloc_user op already accepts user flags for domain allocation, add a parent domain pointer and a driver specific user data support as well.
Add a struct iommu_user_data as a bundle of data_ptr/data_len/type from an iommufd core uAPI structure. Make the user data opaque to the core, since a userspace driver must match the kernel driver. In the future, if drivers share some common parameter, there would be a generic parameter as well.
Define an enum iommu_hwpt_data_type (with IOMMU_HWPT_DATA_NONE type) for iommu drivers to add their own driver specific user data per hw_pagetable.
--- drivers/iommu/intel/iommu.c | 7 ++++++- drivers/iommu/iommufd/hw_pagetable.c | 3 ++- drivers/iommu/iommufd/selftest.c | 7 ++++++- include/linux/iommu.h | 27 ++++++++++++++++++++++++--- include/uapi/linux/iommufd.h | 8 ++++++++ 5 files changed, 46 insertions(+), 6 deletions(-)
drivers/iommu/intel/iommu.c +6 -1
@@ -4076,7 +4076,9 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type) }static struct iommu_domain * -intel_iommu_domain_alloc_user (struct device *dev,u32 flags) +intel_iommu_domain_alloc_user (struct device *dev,u32 flags, +struct iommu_domain *parent, +const struct iommu_user_data *user_data) {struct iommu_domain *domain;struct intel_iommu *iommu;
@@ -4086,6 +4088,9 @@ intel_iommu_domain_alloc_user(struct device *dev, u32 flags) (~(IOMMU_HWPT_ALLOC_NEST_PARENT | IOMMU_HWPT_ALLOC_DIRTY_TRACKING)))return ERR_PTR (-EOPNOTSUPP ); +if (parent || user_data) +return ERR_PTR (-EOPNOTSUPP ); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return ERR_PTR (-ENODEV );
drivers/iommu/iommufd/hw_pagetable.c +2 -1
@@ -96,7 +96,8 @@ iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, hwpt->ioas = ioas;if (ops->domain_alloc_user) { - hwpt->domain = ops->domain_alloc_user (idev->dev, flags); + hwpt->domain = ops->domain_alloc_user (idev->dev, flags, +NULL ,NULL );if (IS_ERR (hwpt->domain)) { rc =PTR_ERR (hwpt->domain); hwpt->domain =NULL ;
drivers/iommu/iommufd/selftest.c +6 -1
@@ -241,7 +241,9 @@ static struct iommu_domain *mock_domain_alloc(unsigned int iommu_domain_type) }static struct iommu_domain * -mock_domain_alloc_user (struct device *dev,u32 flags) +mock_domain_alloc_user (struct device *dev,u32 flags, +struct iommu_domain *parent, +const struct iommu_user_data *user_data) { struct mock_dev *mdev = container_of(dev, struct mock_dev, dev);struct iommu_domain *domain;
@@ -250,6 +252,9 @@ mock_domain_alloc_user(struct device *dev, u32 flags) (~(IOMMU_HWPT_ALLOC_NEST_PARENT | IOMMU_HWPT_ALLOC_DIRTY_TRACKING)))return ERR_PTR (-EOPNOTSUPP ); +if (parent || user_data) +return ERR_PTR (-EOPNOTSUPP ); +if ((flags &IOMMU_HWPT_ALLOC_DIRTY_TRACKING ) && (mdev->flags &MOCK_FLAGS_DEVICE_NO_DIRTY ))return ERR_PTR (-EOPNOTSUPP );
include/linux/iommu.h +24 -3
@@ -265,6 +265,21 @@ struct iommu_dirty_ops { struct iommu_dirty_bitmap *dirty); }; +/** +* struct iommu_user_data - iommu driver specific user space data info +* @type: The data type of the user buffer +* @uptr: Pointer to the user buffer for copy_from_user() +* @len: The length of the user buffer in bytes +* +* A user space data is an uAPI that is defined in include/uapi/linux/iommufd.h +* @type, @uptr and @len should be just copied from an iommufd core uAPI struct. +*/ +struct iommu_user_data { +unsigned int type; +void __user *uptr; +size_t len; +}; +/** * struct iommu_ops - iommu ops and capabilities * @capable: check capability
@@ -279,8 +294,12 @@ struct iommu_dirty_ops {* parameters as defined in include/uapi/linux/iommufd.h. * Unlike @domain_alloc, it is called only by IOMMUFD and * must fully initialize the new domain before return. -* Upon success, a domain is returned. Upon failure, -* ERR_PTR must be returned. +* Upon success, if the @user_data is valid and the @parent +* points to a kernel-managed domain, the new domain must be +* IOMMU_DOMAIN_NESTED type; otherwise, the @parent must be +* NULL while the @user_data can be optionally provided, the +* new domain must support __IOMMU_DOMAIN_PAGING. +* Upon failure, ERR_PTR must be returned. * @probe_device: Add device to iommu driver handling * @release_device: Remove device from iommu driver handling * @probe_finalize: Do final setup work after the device is added to an IOMMU
@@ -313,7 +332,9 @@ struct iommu_ops {/* Domain allocation and freeing by the iommu driver */ struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type); -struct iommu_domain *(*domain_alloc_user)(struct device *dev,u32 flags); +struct iommu_domain *(*domain_alloc_user)(struct device *dev,u32 flags, +struct iommu_domain *parent, +const struct iommu_user_data *user_data);struct iommu_device *(*probe_device)(struct device *dev);void (*release_device)(struct device *dev);
include/uapi/linux/iommufd.h +8 -0
@@ -361,6 +361,14 @@ enum iommufd_hwpt_alloc_flags { IOMMU_HWPT_ALLOC_DIRTY_TRACKING = 1 << 1, }; +/** +* enum iommu_hwpt_data_type - IOMMU HWPT Data Type +* @IOMMU_HWPT_DATA_NONE: no data +*/ +enum iommu_hwpt_data_type { +IOMMU_HWPT_DATA_NONE , +}; +/** * struct iommu_hwpt_alloc - ioctl(IOMMU_HWPT_ALLOC) * @size: sizeof(struct iommu_hwpt_alloc)
Signature · 1 line
2.34.1
Re: [PATCH v6 02/10] iommu: Pass in parent domain with user_data to domain_alloc_user op
Quoted 11 lines · Yi Liu
domain_alloc_userop already accepts user flags for domain allocation, add a parent domain pointer and a driver specific user data support as well.Add a struct
iommu_user_dataas a bundle of data_ptr/data_len/type from an iommufd core uAPI structure. Make the user data opaque to the core, since a userspace driver must match the kernel driver. In the future, if drivers share some common parameter, there would be a generic parameter as well.Define an enum
iommu_hwpt_data_type(withIOMMU_HWPT_DATA_NONEtype) for iommu drivers to add their own driver specific user data perhw_pagetable.
Quoted 6 lines
Signed-off-by Lu Baolu <[email protected]>Co-developed-by Nicolin Chen <[email protected]>Signed-off-by Nicolin Chen <[email protected]>Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/intel/iommu.c | 7 ++++++-
You are sadly missing AMD IOMMU
This would fix the build and nack the op should parent or user_data be passed:
drivers/iommu/amd/iommu.c +0 -0
@@ -2220,13 +2220,17 @@ static struct iommu_domain
*amd_iommu_domain_alloc(unsigned int type)
}
static struct iommu_domain *amd_iommu_domain_alloc_user(struct device *dev,
- u32 flags)
+ u32 flags, struct iommu_domain *parent,
+ const struct iommu_user_data *user_data)
{
unsigned int type = IOMMU_DOMAIN_UNMANAGED;
if (flags & ~IOMMU_HWPT_ALLOC_DIRTY_TRACKING)
return ERR_PTR(-EOPNOTSUPP);+ if (parent || user_data)
+ return ERR_PTR(-EOPNOTSUPP);
+
return do_iommu_domain_alloc(type, dev, flags);
}
Re: [PATCH v6 02/10] iommu: Pass in parent domain with user_data to domain_alloc_user op
Quoted 12 lines · Joao Martins
Quoted 11 lines · Yi Liu
domain_alloc_userop already accepts user flags for domain allocation, add a parent domain pointer and a driver specific user data support as well.Add a struct
iommu_user_dataas a bundle of data_ptr/data_len/type from an iommufd core uAPI structure. Make the user data opaque to the core, since a userspace driver must match the kernel driver. In the future, if drivers share some common parameter, there would be a generic parameter as well.Define an enum
iommu_hwpt_data_type(withIOMMU_HWPT_DATA_NONEtype) for iommu drivers to add their own driver specific user data perhw_pagetable.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Lu Baolu <[email protected]>Co-developed-by Nicolin Chen <[email protected]>Signed-off-by Nicolin Chen <[email protected]>Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/intel/iommu.c | 7 ++++++-You are sadly missing AMD IOMMU
good catch.
Quoted 16 lines
This would fix the build and nack the op should parent or
user_databe passed:drivers/iommu/amd/iommu.c +2
-1@@ -2220,13 +2220,17 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned int type) }static struct iommu_domain *amd_iommu_domain_alloc_user (struct device *dev, -u32 flags) +u32 flags,struct iommu_domain *parent, +const struct iommu_user_data *user_data) {
drivers/iommu/amd/iommu.c static struct iommu_domain · line 2236
Quoted 10 lines
drivers/iommu/amd/iommu.c +3
-0unsigned int type =IOMMU_DOMAIN_UNMANAGED ;if (flags & ~IOMMU_HWPT_ALLOC_DIRTY_TRACKING )return ERR_PTR (-EOPNOTSUPP ); +if (parent || user_data) +return ERR_PTR (-EOPNOTSUPP ); +return do_iommu_domain_alloc (type, dev, flags); }
yes, this should work. @Jason, one more version or just this one with the above diff from Joao?
Signature · 2 lines
Regards, Yi Liu
Jason Gunthorpe
maintainerRe: [PATCH v6 02/10] iommu: Pass in parent domain with user_data to domain_alloc_user op
In reply to Yi LiuQuoted 15 lines · Yi Liu
domain_alloc_userop already accepts user flags for domain allocation, add a parent domain pointer and a driver specific user data support as well.Add a struct
iommu_user_dataas a bundle of data_ptr/data_len/type from an iommufd core uAPI structure. Make the user data opaque to the core, since a userspace driver must match the kernel driver. In the future, if drivers share some common parameter, there would be a generic parameter as well.Define an enum
iommu_hwpt_data_type(withIOMMU_HWPT_DATA_NONEtype) for iommu drivers to add their own driver specific user data perhw_pagetable.Signed-off-by Lu Baolu <[email protected]>Co-developed-by Nicolin Chen <[email protected]>Signed-off-by Nicolin Chen <[email protected]>Signed-off-by Yi Liu <[email protected]>
Quoted 7 lines
--- drivers/iommu/intel/iommu.c | 7 ++++++- drivers/iommu/iommufd/hw_pagetable.c | 3 ++- drivers/iommu/iommufd/selftest.c | 7 ++++++- include/linux/iommu.h | 27 ++++++++++++++++++++++++--- include/uapi/linux/iommufd.h | 8 ++++++++ 5 files changed, 46 insertions(+), 6 deletions(-)
This patch should be immediately before "iommufd: Add a nested HW pagetable object"
Since it is basically preperation for that patch
Quoted 6 lines
include/uapi/linux/iommufd.h +0
-0@@ -361,6 +361,14 @@ enum iommufd_hwpt_alloc_flags { IOMMU_HWPT_ALLOC_DIRTY_TRACKING = 1 << 1,
include/uapi/linux/iommufd.h enum iommufd_hwpt_alloc_flags { · line 371
Quoted 10 lines
include/uapi/linux/iommufd.h +8
-0}; +/** +* enum iommu_hwpt_data_type - IOMMU HWPT Data Type +* @IOMMU_HWPT_DATA_NONE: no data +*/ +enum iommu_hwpt_data_type { +IOMMU_HWPT_DATA_NONE , +}; +
And this hunk should go in "iommufd: Add a nested HW pagetable object"
With the rest of the uapi
Jason
PATCH v6 3/10 iommufd: Rename IOMMUFD_OBJ_HW_PAGETABLE to IOMMUFD_OBJ_HWPT_PAGING
In reply to Yi LiuFrom: Jason Gunthorpe <[email protected]>
To add a new IOMMUFD_OBJ_HWPT_NESTED, rename the HWPT object to confine it to PAGING hwpts/domains. The following patch will separate the hwpt structure as well.
--- drivers/iommu/iommufd/device.c | 10 +++++----- drivers/iommu/iommufd/hw_pagetable.c | 2 +- drivers/iommu/iommufd/iommufd_private.h | 4 ++-- drivers/iommu/iommufd/main.c | 2 +- drivers/iommu/iommufd/selftest.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/iommu/iommufd/device.c +5 -5
@@ -563,7 +563,7 @@ static int iommufd_device_change_pt(struct iommufd_device *idev, u32 *pt_id,return PTR_ERR (pt_obj);switch (pt_obj->type) { -case IOMMUFD_OBJ_HW_PAGETABLE : { +case IOMMUFD_OBJ_HWPT_PAGING : {struct iommufd_hw_pagetable *hwpt = container_of(pt_obj, struct iommufd_hw_pagetable, obj);
@@ -601,8 +601,8 @@ static int iommufd_device_change_pt(struct iommufd_device *idev, u32 *pt_id,/** * iommufd_device_attach - Connect a device to an iommu_domain * @idev: device to attach -* @pt_id: Input a IOMMUFD_OBJ_IOAS, or IOMMUFD_OBJ_HW_PAGETABLE -* Output the IOMMUFD_OBJ_HW_PAGETABLE ID +* @pt_id: Input a IOMMUFD_OBJ_IOAS, or IOMMUFD_OBJ_HWPT_PAGING +* Output the IOMMUFD_OBJ_HWPT_PAGING ID * * This connects the device to an iommu_domain, either automatically or manually * selected. Once this completes the device could do DMA.
@@ -630,8 +630,8 @@ EXPORT_SYMBOL_NS_GPL(iommufd_device_attach, IOMMUFD);/** * iommufd_device_replace - Change the device's iommu_domain * @idev: device to change -* @pt_id: Input a IOMMUFD_OBJ_IOAS, or IOMMUFD_OBJ_HW_PAGETABLE -* Output the IOMMUFD_OBJ_HW_PAGETABLE ID +* @pt_id: Input a IOMMUFD_OBJ_IOAS, or IOMMUFD_OBJ_HWPT_PAGING +* Output the IOMMUFD_OBJ_HWPT_PAGING ID * * This is the same as:: *
drivers/iommu/iommufd/hw_pagetable.c +1 -1
@@ -86,7 +86,7 @@ iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,if (flags && !ops->domain_alloc_user)return ERR_PTR (-EOPNOTSUPP ); - hwpt =iommufd_object_alloc (ictx, hwpt,IOMMUFD_OBJ_HW_PAGETABLE ); + hwpt =iommufd_object_alloc (ictx, hwpt,IOMMUFD_OBJ_HWPT_PAGING );if (IS_ERR (hwpt))return hwpt;
drivers/iommu/iommufd/iommufd_private.h +2 -2
@@ -123,7 +123,7 @@ enum iommufd_object_type {IOMMUFD_OBJ_NONE ,IOMMUFD_OBJ_ANY =IOMMUFD_OBJ_NONE ,IOMMUFD_OBJ_DEVICE , -IOMMUFD_OBJ_HW_PAGETABLE , +IOMMUFD_OBJ_HWPT_PAGING ,IOMMUFD_OBJ_IOAS ,IOMMUFD_OBJ_ACCESS , #ifdef CONFIG_IOMMUFD_TEST
@@ -256,7 +256,7 @@ static inline struct iommufd_hw_pagetable * iommufd_get_hwpt(struct iommufd_ucmd *ucmd, u32 id) {return container_of (iommufd_get_object (ucmd->ictx, id, -IOMMUFD_OBJ_HW_PAGETABLE ), +IOMMUFD_OBJ_HWPT_PAGING ), struct iommufd_hw_pagetable, obj); }int iommufd_hwpt_set_dirty_tracking (struct iommufd_ucmd *ucmd);
drivers/iommu/iommufd/main.c +1 -1
@@ -488,7 +488,7 @@ static const struct iommufd_object_ops iommufd_object_ops[] = { [IOMMUFD_OBJ_IOAS] = { .destroy = iommufd_ioas_destroy, }, - [IOMMUFD_OBJ_HW_PAGETABLE] = { + [IOMMUFD_OBJ_HWPT_PAGING] = { .destroy = iommufd_hw_pagetable_destroy, .abort = iommufd_hw_pagetable_abort, },
drivers/iommu/iommufd/selftest.c +1 -1
@@ -442,7 +442,7 @@ get_md_pagetable(struct iommufd_ucmd *ucmd, u32 mockpt_id,struct iommufd_object *obj; obj =iommufd_get_object (ucmd->ictx, mockpt_id, -IOMMUFD_OBJ_HW_PAGETABLE ); +IOMMUFD_OBJ_HWPT_PAGING );if (IS_ERR (obj))return ERR_CAST (obj); hwpt = container_of(obj, struct iommufd_hw_pagetable, obj);
Signature · 1 line
2.34.1
PATCH v6 4/10 iommufd/device: Wrap IOMMUFD_OBJ_HWPT_PAGING-only configurations
In reply to Yi LiuFrom: Jason Gunthorpe <[email protected]>
Some of the configurations during the attach/replace() should only apply to IOMMUFD_OBJ_HWPT_PAGING. Once IOMMUFD_OBJ_HWPT_NESTED gets introduced in a following patch, keeping them unconditionally in the common routine will not work.
Wrap all of those PAGING-only configurations together into helpers. Do a hwpt_is_paging check whenever calling them or their fallback routines.
--- drivers/iommu/iommufd/device.c | 110 +++++++++++++++++------- drivers/iommu/iommufd/iommufd_private.h | 5 ++ 2 files changed, 85 insertions(+), 30 deletions(-)
drivers/iommu/iommufd/device.c +80 -30
@@ -325,6 +325,28 @@ static int iommufd_group_setup_msi(struct iommufd_group *igroup,return 0 ; } +static int iommufd_hwpt_paging_attach (struct iommufd_hw_pagetable *hwpt, +struct iommufd_device *idev) +{ +int rc; + +lockdep_assert_held (&idev->igroup->lock); + + rc =iopt_table_enforce_dev_resv_regions (&hwpt->ioas->iopt, idev->dev, + &idev->igroup->sw_msi_start); +if (rc) +return rc; + +if (list_empty (&idev->igroup->device_list)) { + rc =iommufd_group_setup_msi (idev->igroup, hwpt); +if (rc) { +iopt_remove_reserved_iova (&hwpt->ioas->iopt, idev->dev); +return rc; + } + } +return 0 ; +} +int iommufd_hw_pagetable_attach (struct iommufd_hw_pagetable *hwpt,struct iommufd_device *idev) {
@@ -337,10 +359,11 @@ int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt, goto err_unlock; } - rc =iopt_table_enforce_dev_resv_regions (&hwpt->ioas->iopt, idev->dev, - &idev->igroup->sw_msi_start); -if (rc) - goto err_unlock; +if (hwpt_is_paging (hwpt)) { + rc =iommufd_hwpt_paging_attach (hwpt, idev); +if (rc) + goto err_unlock; + }/* * Only attach to the group once for the first device that is in the
@@ -350,10 +373,6 @@ int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt,* attachment. */ if (list_empty (&idev->igroup->device_list)) { - rc =iommufd_group_setup_msi (idev->igroup, hwpt); -if (rc) - goto err_unresv; - rc =iommu_attach_group (hwpt->domain, idev->igroup->group);if (rc) goto err_unresv;
@@ -364,7 +383,8 @@ int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt,mutex_unlock (&idev->igroup->lock);return 0 ; err_unresv: -iopt_remove_reserved_iova (&hwpt->ioas->iopt, idev->dev); +if (hwpt_is_paging (hwpt)) +iopt_remove_reserved_iova (&hwpt->ioas->iopt, idev->dev); err_unlock:mutex_unlock (&idev->igroup->lock);return rc;
@@ -381,7 +401,8 @@ iommufd_hw_pagetable_detach(struct iommufd_device *idev)iommu_detach_group (hwpt->domain, idev->igroup->group); idev->igroup->hwpt =NULL ; } -iopt_remove_reserved_iova (&hwpt->ioas->iopt, idev->dev); +if (hwpt_is_paging (hwpt)) +iopt_remove_reserved_iova (&hwpt->ioas->iopt, idev->dev);mutex_unlock (&idev->igroup->lock);/* Caller must destroy hwpt */
@@ -400,13 +421,51 @@ iommufd_device_do_attach(struct iommufd_device *idev,return NULL ; } +static void iommufd_group_remove_reserved_iova (struct iommufd_group *igroup, +struct iommufd_hw_pagetable *hwpt) +{ +struct iommufd_device *cur; + +lockdep_assert_held (&igroup->lock); + +list_for_each_entry (cur, &igroup->device_list, group_item) +iopt_remove_reserved_iova (&hwpt->ioas->iopt, cur->dev); +} + +static int iommufd_group_do_replace_paging (struct iommufd_group *igroup, +struct iommufd_hw_pagetable *hwpt) +{ +struct iommufd_hw_pagetable *old_hwpt = igroup->hwpt; +struct iommufd_device *cur; +int rc; + +lockdep_assert_held (&igroup->lock); + +if (hwpt_is_paging (old_hwpt) && hwpt->ioas != old_hwpt->ioas) { +list_for_each_entry (cur, &igroup->device_list, group_item) { + rc =iopt_table_enforce_dev_resv_regions ( + &hwpt->ioas->iopt, cur->dev,NULL ); +if (rc) + goto err_unresv; + } + } + + rc =iommufd_group_setup_msi (igroup, hwpt); +if (rc) + goto err_unresv; +return 0 ; + +err_unresv: +iommufd_group_remove_reserved_iova (igroup, hwpt); +return rc; +} +static struct iommufd_hw_pagetable *iommufd_device_do_replace (struct iommufd_device *idev,struct iommufd_hw_pagetable *hwpt) {struct iommufd_group *igroup = idev->igroup;struct iommufd_hw_pagetable *old_hwpt; -struct iommufd_device *cur;unsigned int num_devices;int rc;
@@ -422,29 +481,20 @@ iommufd_device_do_replace(struct iommufd_device *idev,return NULL ; } - old_hwpt = igroup->hwpt; -if (hwpt->ioas != old_hwpt->ioas) { -list_for_each_entry (cur, &igroup->device_list, group_item) { - rc =iopt_table_enforce_dev_resv_regions ( - &hwpt->ioas->iopt, cur->dev,NULL ); -if (rc) - goto err_unresv; - } +if (hwpt_is_paging (hwpt)) { + rc =iommufd_group_do_replace_paging (igroup, hwpt); +if (rc) + goto err_unlock; } - rc =iommufd_group_setup_msi (idev->igroup, hwpt); -if (rc) - goto err_unresv; - rc =iommu_group_replace_domain (igroup->group, hwpt->domain);if (rc) goto err_unresv; -if (hwpt->ioas != old_hwpt->ioas) { -list_for_each_entry (cur, &igroup->device_list, group_item) -iopt_remove_reserved_iova (&old_hwpt->ioas->iopt, - cur->dev); - } + old_hwpt = igroup->hwpt; +if (hwpt_is_paging (old_hwpt) && + (!hwpt_is_paging (hwpt) || hwpt->ioas != old_hwpt->ioas)) +iommufd_group_remove_reserved_iova (igroup, old_hwpt); igroup->hwpt = hwpt;
@@ -462,8 +512,8 @@ iommufd_device_do_replace(struct iommufd_device *idev,/* Caller must destroy old_hwpt */ return old_hwpt; err_unresv: -list_for_each_entry (cur, &igroup->device_list, group_item) -iopt_remove_reserved_iova (&hwpt->ioas->iopt, cur->dev); +if (hwpt_is_paging (hwpt)) +iommufd_group_remove_reserved_iova (igroup, hwpt); err_unlock:mutex_unlock (&idev->igroup->lock);return ERR_PTR (rc);
drivers/iommu/iommufd/iommufd_private.h +5 -0
@@ -252,6 +252,11 @@ struct iommufd_hw_pagetable {struct list_head hwpt_item; }; +static inline bool hwpt_is_paging (struct iommufd_hw_pagetable *hwpt) +{ +return hwpt->obj.type ==IOMMUFD_OBJ_HWPT_PAGING ; +} +static inline struct iommufd_hw_pagetable *iommufd_get_hwpt (struct iommufd_ucmd *ucmd,u32 id) {
Signature · 1 line
2.34.1
Tian, Kevin
maintainerRE: [PATCH v6 04/10] iommufd/device: Wrap IOMMUFD_OBJ_HWPT_PAGING-only configurations
Quoted 11 lines
From: Liu, Yi L <[email protected]>
Sent: Tuesday, October 24, 2023 11:06 PM(quoted diff) +2
-0+ +static int iommufd_group_do_replace_paging(struct iommufd_group*igroup,
(quoted diff) +1
-0+ struct iommufd_hw_pagetable*hwpt)
drivers/iommu/iommufd/device.c +4
-0+{ +struct iommufd_hw_pagetable *old_hwpt = igroup->hwpt; +struct iommufd_device *cur; +int rc;
drivers/iommu/iommufd/device.c iommufd_device_do_attach(struct iommufd_device *idev, · line 450
Quoted 10 lines
drivers/iommu/iommufd/device.c +10
-0+ +lockdep_assert_held (&igroup->lock); + +if (hwpt_is_paging (old_hwpt) && hwpt->ioas != old_hwpt->ioas) { +list_for_each_entry (cur, &igroup->device_list, group_item) { + rc =iopt_table_enforce_dev_resv_regions ( + &hwpt->ioas->iopt, cur->dev,NULL ); +if (rc) + goto err_unresv; + }
should be:
if (!hwpt_is_paging(old_hwpt) || hwpt->ioas != old_hwpt->ioas) {
...Re: [PATCH v6 04/10] iommufd/device: Wrap IOMMUFD_OBJ_HWPT_PAGING-only configurations
Quoted 24 lines · Kevin
Quoted 11 lines
From: Liu, Yi L <[email protected]>
Sent: Tuesday, October 24, 2023 11:06 PM(quoted diff) +2
-0+ +static int iommufd_group_do_replace_paging(struct iommufd_group*igroup,
(quoted diff) +1
-0+ struct iommufd_hw_pagetable*hwpt)
drivers/iommu/iommufd/device.c +4
-0+{ +struct iommufd_hw_pagetable *old_hwpt = igroup->hwpt; +struct iommufd_device *cur; +int rc;drivers/iommu/iommufd/device.c iommufd_device_do_attach(struct iommufd_device *idev, · line 450
Quoted 10 lines
drivers/iommu/iommufd/device.c +10
-0+ +lockdep_assert_held (&igroup->lock); + +if (hwpt_is_paging (old_hwpt) && hwpt->ioas != old_hwpt->ioas) { +list_for_each_entry (cur, &igroup->device_list, group_item) { + rc =iopt_table_enforce_dev_resv_regions ( + &hwpt->ioas->iopt, cur->dev,NULL ); +if (rc) + goto err_unresv; + }should be:
Quoted 2 lines
if (!hwpt_is_paging(old_hwpt) || hwpt->ioas != old_hwpt->ioas) {
...oh, yes. The original logic is to add resv region when the ioas are different between new and old hwpts. But now, if the old hwpt is not paging, then it's already needed to add resv regions in the ioas.
Regards,
Yi Liu
PATCH v6 5/10 iommufd: Derive iommufd_hwpt_paging from iommufd_hw_pagetable
In reply to Yi LiuFrom: Nicolin Chen <[email protected]>
To prepare for IOMMUFD_OBJ_HWPT_NESTED, derive struct iommufd_hwpt_paging from struct iommufd_hw_pagetable, by leaving the common members in struct iommufd_hw_pagetable. Add a __iommufd_object_alloc and to_hwpt_paging() helpers for the new structure.
Then, update "hwpt" to "hwpt_paging" throughout the files, accordingly.
--- drivers/iommu/iommufd/device.c | 74 ++++++++------ drivers/iommu/iommufd/hw_pagetable.c | 129 +++++++++++++----------- drivers/iommu/iommufd/iommufd_private.h | 41 +++++--- drivers/iommu/iommufd/main.c | 4 +- drivers/iommu/iommufd/vfio_compat.c | 6 +- 5 files changed, 148 insertions(+), 106 deletions(-)
drivers/iommu/iommufd/device.c +44 -30
@@ -293,7 +293,7 @@ u32 iommufd_device_to_id(struct iommufd_device *idev)EXPORT_SYMBOL_NS_GPL (iommufd_device_to_id,IOMMUFD );static int iommufd_group_setup_msi (struct iommufd_group *igroup, -struct iommufd_hw_pagetable *hwpt) +struct iommufd_hwpt_paging *hwpt_paging) {phys_addr_t sw_msi_start = igroup->sw_msi_start;int rc;
@@ -311,8 +311,9 @@ static int iommufd_group_setup_msi(struct iommufd_group *igroup,* matches what the IRQ layer actually expects in a newly created * domain. */ -if (sw_msi_start !=PHYS_ADDR_MAX && !hwpt->msi_cookie) { - rc =iommu_get_msi_cookie (hwpt->domain, sw_msi_start); +if (sw_msi_start !=PHYS_ADDR_MAX && !hwpt_paging->msi_cookie) { + rc =iommu_get_msi_cookie (hwpt_paging->common.domain, + sw_msi_start);if (rc)return rc;
@@ -320,27 +321,29 @@ static int iommufd_group_setup_msi(struct iommufd_group *igroup,* iommu_get_msi_cookie() can only be called once per domain, * it returns -EBUSY on later calls. */ - hwpt->msi_cookie = true; + hwpt_paging->msi_cookie = true; }return 0 ; } -static int iommufd_hwpt_paging_attach (struct iommufd_hw_pagetable *hwpt, +static int iommufd_hwpt_paging_attach (struct iommufd_hwpt_paging *hwpt_paging,struct iommufd_device *idev) {int rc;lockdep_assert_held (&idev->igroup->lock); - rc =iopt_table_enforce_dev_resv_regions (&hwpt->ioas->iopt, idev->dev, + rc =iopt_table_enforce_dev_resv_regions (&hwpt_paging->ioas->iopt, + idev->dev, &idev->igroup->sw_msi_start);if (rc)return rc;if (list_empty (&idev->igroup->device_list)) { - rc =iommufd_group_setup_msi (idev->igroup, hwpt); + rc =iommufd_group_setup_msi (idev->igroup, hwpt_paging);if (rc) { -iopt_remove_reserved_iova (&hwpt->ioas->iopt, idev->dev); +iopt_remove_reserved_iova (&hwpt_paging->ioas->iopt, + idev->dev);return rc; } }
@@ -360,7 +363,7 @@ int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt, }if (hwpt_is_paging (hwpt)) { - rc =iommufd_hwpt_paging_attach (hwpt, idev); + rc =iommufd_hwpt_paging_attach (to_hwpt_paging (hwpt), idev);if (rc) goto err_unlock; }
@@ -384,7 +387,8 @@ int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt,return 0 ; err_unresv:if (hwpt_is_paging (hwpt)) -iopt_remove_reserved_iova (&hwpt->ioas->iopt, idev->dev); +iopt_remove_reserved_iova (&to_hwpt_paging (hwpt)->ioas->iopt, + idev->dev); err_unlock:mutex_unlock (&idev->igroup->lock);return rc;
@@ -402,7 +406,8 @@ iommufd_hw_pagetable_detach(struct iommufd_device *idev) idev->igroup->hwpt =NULL ; }if (hwpt_is_paging (hwpt)) -iopt_remove_reserved_iova (&hwpt->ioas->iopt, idev->dev); +iopt_remove_reserved_iova (&to_hwpt_paging (hwpt)->ioas->iopt, + idev->dev);mutex_unlock (&idev->igroup->lock);/* Caller must destroy hwpt */
@@ -421,19 +426,20 @@ iommufd_device_do_attach(struct iommufd_device *idev,return NULL ; } -static void iommufd_group_remove_reserved_iova (struct iommufd_group *igroup, -struct iommufd_hw_pagetable *hwpt) +static void +iommufd_group_remove_reserved_iova (struct iommufd_group *igroup, +struct iommufd_hwpt_paging *hwpt_paging) {struct iommufd_device *cur;lockdep_assert_held (&igroup->lock);list_for_each_entry (cur, &igroup->device_list, group_item) -iopt_remove_reserved_iova (&hwpt->ioas->iopt, cur->dev); +iopt_remove_reserved_iova (&hwpt_paging->ioas->iopt, cur->dev); }static int iommufd_group_do_replace_paging (struct iommufd_group *igroup, -struct iommufd_hw_pagetable *hwpt) +struct iommufd_hwpt_paging *hwpt_paging) {struct iommufd_hw_pagetable *old_hwpt = igroup->hwpt;struct iommufd_device *cur;
@@ -441,22 +447,23 @@ static int iommufd_group_do_replace_paging(struct iommufd_group *igroup,lockdep_assert_held (&igroup->lock); -if (hwpt_is_paging (old_hwpt) && hwpt->ioas != old_hwpt->ioas) { +if (hwpt_is_paging (old_hwpt) && + hwpt_paging->ioas !=to_hwpt_paging (old_hwpt)->ioas) {list_for_each_entry (cur, &igroup->device_list, group_item) { rc =iopt_table_enforce_dev_resv_regions ( - &hwpt->ioas->iopt, cur->dev,NULL ); + &hwpt_paging->ioas->iopt, cur->dev,NULL );if (rc) goto err_unresv; } } - rc =iommufd_group_setup_msi (igroup, hwpt); + rc =iommufd_group_setup_msi (igroup, hwpt_paging);if (rc) goto err_unresv;return 0 ; err_unresv: -iommufd_group_remove_reserved_iova (igroup, hwpt); +iommufd_group_remove_reserved_iova (igroup, hwpt_paging);return rc; }
@@ -482,7 +489,8 @@ iommufd_device_do_replace(struct iommufd_device *idev, }if (hwpt_is_paging (hwpt)) { - rc =iommufd_group_do_replace_paging (igroup, hwpt); + rc =iommufd_group_do_replace_paging (igroup, +to_hwpt_paging (hwpt));if (rc) goto err_unlock; }
@@ -493,8 +501,10 @@ iommufd_device_do_replace(struct iommufd_device *idev, old_hwpt = igroup->hwpt;if (hwpt_is_paging (old_hwpt) && - (!hwpt_is_paging (hwpt) || hwpt->ioas != old_hwpt->ioas)) -iommufd_group_remove_reserved_iova (igroup, old_hwpt); + (!hwpt_is_paging (hwpt) || +to_hwpt_paging (hwpt)->ioas !=to_hwpt_paging (old_hwpt)->ioas)) +iommufd_group_remove_reserved_iova (igroup, +to_hwpt_paging (old_hwpt)); igroup->hwpt = hwpt;
@@ -513,7 +523,8 @@ iommufd_device_do_replace(struct iommufd_device *idev,return old_hwpt; err_unresv:if (hwpt_is_paging (hwpt)) -iommufd_group_remove_reserved_iova (igroup, hwpt); +iommufd_group_remove_reserved_iova (igroup, +to_hwpt_paging (old_hwpt)); err_unlock:mutex_unlock (&idev->igroup->lock);return ERR_PTR (rc);
@@ -541,6 +552,7 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev,*/ bool immediate_attach = do_attach == iommufd_device_do_attach;struct iommufd_hw_pagetable *destroy_hwpt; +struct iommufd_hwpt_paging *hwpt_paging;struct iommufd_hw_pagetable *hwpt;/*
@@ -549,10 +561,11 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev,* other. */ mutex_lock (&ioas->mutex); -list_for_each_entry (hwpt, &ioas->hwpt_list, hwpt_item) { -if (!hwpt->auto_domain) +list_for_each_entry (hwpt_paging, &ioas->hwpt_list, hwpt_item) { +if (!hwpt_paging->auto_domain)continue ; + hwpt = &hwpt_paging->common;if (!iommufd_lock_obj (&hwpt->obj))continue ; destroy_hwpt = (*do_attach)(idev, hwpt);
@@ -573,12 +586,13 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev, goto out_unlock; } - hwpt =iommufd_hw_pagetable_alloc (idev->ictx, ioas, idev, -0 , immediate_attach); -if (IS_ERR (hwpt)) { - destroy_hwpt =ERR_CAST (hwpt); + hwpt_paging =iommufd_hwpt_paging_alloc (idev->ictx, ioas, idev, +0 , immediate_attach); +if (IS_ERR (hwpt_paging)) { + destroy_hwpt =ERR_CAST (hwpt_paging); goto out_unlock; } + hwpt = &hwpt_paging->common;if (!immediate_attach) { destroy_hwpt = (*do_attach)(idev, hwpt);
@@ -588,7 +602,7 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev, destroy_hwpt =NULL ; } - hwpt->auto_domain = true; + hwpt_paging->auto_domain = true; *pt_id = hwpt->obj.id;iommufd_object_finalize (idev->ictx, &hwpt->obj);
drivers/iommu/iommufd/hw_pagetable.c +71 -58
233 lines not on this page · raw message
drivers/iommu/iommufd/iommufd_private.h +28 -13
82 lines not on this page · raw message
drivers/iommu/iommufd/main.c +2 -2
@@ -489,8 +489,8 @@ static const struct iommufd_object_ops iommufd_object_ops[] = { .destroy = iommufd_ioas_destroy, }, [IOMMUFD_OBJ_HWPT_PAGING] = { - .destroy = iommufd_hw_pagetable_destroy, - .abort = iommufd_hw_pagetable_abort, + .destroy = iommufd_hwpt_paging_destroy, + .abort = iommufd_hwpt_paging_abort, }, #ifdef CONFIG_IOMMUFD_TEST [IOMMUFD_OBJ_SELFTEST] = {
drivers/iommu/iommufd/vfio_compat.c +3 -3
@@ -255,7 +255,7 @@ static int iommufd_vfio_unmap_dma(struct iommufd_ctx *ictx, unsigned int cmd,static int iommufd_vfio_cc_iommu (struct iommufd_ctx *ictx) { -struct iommufd_hw_pagetable *hwpt; +struct iommufd_hwpt_paging *hwpt_paging;struct iommufd_ioas *ioas;int rc =1 ;
@@ -264,8 +264,8 @@ static int iommufd_vfio_cc_iommu(struct iommufd_ctx *ictx)return PTR_ERR (ioas);mutex_lock (&ioas->mutex); -list_for_each_entry (hwpt, &ioas->hwpt_list, hwpt_item) { -if (!hwpt->enforce_cache_coherency) { +list_for_each_entry (hwpt_paging, &ioas->hwpt_list, hwpt_item) { +if (!hwpt_paging->enforce_cache_coherency) { rc =0 ;break ; }
Signature · 1 line
2.34.1
Jason Gunthorpe
maintainerRe: [PATCH v6 05/10] iommufd: Derive iommufd_hwpt_paging from iommufd_hw_pagetable
Quoted 58 lines · Yi Liu
static int iommufd_group_do_replace_paging(struct
iommufd_group*igroup,(quoted diff) +12
-8- struct iommufd_hw_pagetable *hwpt) + struct iommufd_hwpt_paging *hwpt_paging) { struct iommufd_hw_pagetable *old_hwpt = igroup->hwpt; struct iommufd_device *cur;@@ -441,22 +447,23 @@ static int iommufd_group_do_replace_paging(struct iommufd_group *igroup, lockdep_assert_held(&igroup->lock); - if (hwpt_is_paging(old_hwpt) && hwpt->ioas != old_hwpt->ioas) { + if (hwpt_is_paging(old_hwpt) && + hwpt_paging->ioas != to_hwpt_paging(old_hwpt)->ioas) { list_for_each_entry(cur, &igroup->device_list, group_item) { rc = iopt_table_enforce_dev_resv_regions( - &hwpt->ioas->iopt, cur->dev, NULL); + &hwpt_paging->ioas->iopt, cur->dev, NULL); if (rc) goto err_unresv; } } - rc = iommufd_group_setup_msi(igroup, hwpt); + rc = iommufd_group_setup_msi(igroup, hwpt_paging); if (rc) goto err_unresv; return 0; err_unresv: - iommufd_group_remove_reserved_iova(igroup, hwpt); + iommufd_group_remove_reserved_iova(igroup, hwpt_paging); return rc; }@@ -482,7 +489,8 @@ iommufd_device_do_replace(struct iommufd_device *idev, } if (hwpt_is_paging(hwpt)) { - rc = iommufd_group_do_replace_paging(igroup, hwpt); + rc = iommufd_group_do_replace_paging(igroup, + to_hwpt_paging(hwpt)); if (rc) goto err_unlock; }@@ -493,8 +501,10 @@ iommufd_device_do_replace(struct iommufd_device *idev, old_hwpt = igroup->hwpt; if (hwpt_is_paging(old_hwpt) && - (!hwpt_is_paging(hwpt) || hwpt->ioas != old_hwpt->ioas)) - iommufd_group_remove_reserved_iova(igroup, old_hwpt); + (!hwpt_is_paging(hwpt) || + to_hwpt_paging(hwpt)->ioas != to_hwpt_paging(old_hwpt)->ioas)) + iommufd_group_remove_reserved_iova(igroup, + to_hwpt_paging(old_hwpt)); igroup->hwpt = hwpt;
Review iommufd_device_do_replace(struct iommufd_device *idev, · line 527
Quoted 6 lines
(quoted diff) +2
-1@@ -513,7 +523,8 @@ iommufd_device_do_replace(struct iommufd_device *idev, return old_hwpt; err_unresv: if (hwpt_is_paging(hwpt)) - iommufd_group_remove_reserved_iova(igroup, hwpt); + iommufd_group_remove_reserved_iova(igroup, + to_hwpt_paging(old_hwpt));
This gets a compiler warning:
../drivers/iommu/iommufd/device.c:527:25: warning: variable 'old_hwpt' is uninitialized when used here [-Wuninitialized]
to_hwpt_paging(old_hwpt));
^~~~~~~~
../drivers/iommu/iommufd/device.c:475:39: note: initialize the variable 'old_hwpt' to silence this warning
struct iommufd_hw_pagetable *old_hwpt;
^
= NULLI fixed it with:
drivers/iommu/iommufd/device.c +1 -1
@@ -488,6 +488,7 @@ iommufd_device_do_replace(struct iommufd_device *idev,return NULL ; } + old_hwpt = igroup->hwpt;if (hwpt_is_paging (hwpt)) { rc =iommufd_group_do_replace_paging (igroup,to_hwpt_paging (hwpt));
@@ -499,7 +500,6 @@ iommufd_device_do_replace(struct iommufd_device *idev,if (rc) goto err_unresv; - old_hwpt = igroup->hwpt;if (hwpt_is_paging (old_hwpt) && (!hwpt_is_paging (hwpt) ||to_hwpt_paging (hwpt)->ioas !=to_hwpt_paging (old_hwpt)->ioas))
Jason
PATCH v6 6/10 iommufd: Share iommufd_hwpt_alloc with IOMMUFD_OBJ_HWPT_NESTED
In reply to Yi LiuFrom: Nicolin Chen <[email protected]>
Allow iommufd_hwpt_alloc() to have a common routine but jump to different allocators corresponding to different user input pt_obj types, either an IOMMUFD_OBJ_IOAS for a PAGING hwpt or an IOMMUFD_OBJ_HWPT_PAGING as the parent for a NESTED hwpt.
Also, move the "flags" validation to the hwpt allocator (paging), so that later the hwpt_nested allocator can do its own separate flags validation.
--- drivers/iommu/iommufd/hw_pagetable.c | 46 ++++++++++++++++++---------- 1 file changed, 29 insertions(+), 17 deletions(-)
drivers/iommu/iommufd/hw_pagetable.c +29 -17
@@ -82,6 +82,8 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, struct iommufd_device *idev, u32 flags, bool immediate_attach) { + const u32 valid_flags = IOMMU_HWPT_ALLOC_NEST_PARENT | +IOMMU_HWPT_ALLOC_DIRTY_TRACKING ;const struct iommu_ops *ops =dev_iommu_ops (idev->dev);struct iommufd_hwpt_paging *hwpt_paging;struct iommufd_hw_pagetable *hwpt;
@@ -91,6 +93,8 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,if (flags && !ops->domain_alloc_user)return ERR_PTR (-EOPNOTSUPP ); +if (flags & ~valid_flags) +return ERR_PTR (-EOPNOTSUPP ); hwpt_paging = __iommufd_object_alloc(ictx, hwpt_paging, IOMMUFD_OBJ_HWPT_PAGING,
@@ -169,35 +173,41 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,int iommufd_hwpt_alloc (struct iommufd_ucmd *ucmd) {struct iommu_hwpt_alloc *cmd = ucmd->cmd; -struct iommufd_hwpt_paging *hwpt_paging;struct iommufd_hw_pagetable *hwpt; +struct iommufd_ioas *ioas =NULL ; +struct iommufd_object *pt_obj;struct iommufd_device *idev; -struct iommufd_ioas *ioas;int rc; -if ((cmd->flags & ~(IOMMU_HWPT_ALLOC_NEST_PARENT | -IOMMU_HWPT_ALLOC_DIRTY_TRACKING )) || - cmd->__reserved) +if (cmd->__reserved)return -EOPNOTSUPP ; idev =iommufd_get_device (ucmd, cmd->dev_id);if (IS_ERR (idev))return PTR_ERR (idev); - ioas =iommufd_get_ioas (ucmd->ictx, cmd->pt_id); -if (IS_ERR (ioas)) { - rc =PTR_ERR (ioas); + pt_obj =iommufd_get_object (ucmd->ictx, cmd->pt_id,IOMMUFD_OBJ_ANY ); +if (IS_ERR (pt_obj)) { + rc = -EINVAL ; goto out_put_idev; } -mutex_lock (&ioas->mutex); - hwpt_paging =iommufd_hwpt_paging_alloc (ucmd->ictx, ioas, idev, - cmd->flags, false); -if (IS_ERR (hwpt_paging)) { - rc =PTR_ERR (hwpt_paging); - goto out_unlock; +if (pt_obj->type ==IOMMUFD_OBJ_IOAS ) { +struct iommufd_hwpt_paging *hwpt_paging; + + ioas = container_of(pt_obj, struct iommufd_ioas, obj); +mutex_lock (&ioas->mutex); + hwpt_paging =iommufd_hwpt_paging_alloc (ucmd->ictx, ioas, idev, + cmd->flags, false); +if (IS_ERR (hwpt_paging)) { + rc =PTR_ERR (hwpt_paging); + goto out_unlock; + } + hwpt = &hwpt_paging->common; + }else { + rc = -EINVAL ; + goto out_put_pt; } - hwpt = &hwpt_paging->common; cmd->out_hwpt_id = hwpt->obj.id; rc =iommufd_ucmd_respond (ucmd,sizeof (*cmd));
@@ -209,8 +219,10 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) out_hwpt:iommufd_object_abort_and_destroy (ucmd->ictx, &hwpt->obj); out_unlock: -mutex_unlock (&ioas->mutex); -iommufd_put_object (&ioas->obj); +if (ioas) +mutex_unlock (&ioas->mutex); +out_put_pt: +iommufd_put_object (pt_obj); out_put_idev:iommufd_put_object (&idev->obj);return rc;
Signature · 1 line
2.34.1
PATCH v6 7/10 iommufd: Add a nested HW pagetable object
In reply to Yi LiuFrom: Nicolin Chen <[email protected]>
IOMMU_HWPT_ALLOC already supports iommu_domain allocation for usersapce. But it can only allocate a hw_pagetable that associates to a given IOAS, i.e. only a kernel-managed hw_pagetable of IOMMUFD_OBJ_HWPT_PAGING type.
IOMMU drivers can now support user-managed hw_pagetables, for two-stage translation use cases that require user data input from the user space.
Add a new IOMMUFD_OBJ_HWPT_NESTED type with its abort/destroy(). Pair it with a new iommufd_hwpt_nested structure and its to_hwpt_nested() helper. Update the to_hwpt_paging() helper, so a NESTED-type hw_pagetable can be handled in the callers, for example iommufd_hw_pagetable_enforce_rr().
Screen the inputs including the parent PAGING-type hw_pagetable that has a need of a new nest_parent flag in the iommufd_hwpt_paging structure.
Extend the IOMMU_HWPT_ALLOC ioctl to accept an IOMMU driver specific data input. Also, update the @pt_id to accept hwpt_id too besides an ioas_id. Then, use them to allocate a hw_pagetable of IOMMUFD_OBJ_HWPT_NESTED type using the iommufd_hw_pagetable_alloc_nested() allocator.
--- drivers/iommu/iommufd/device.c | 1 + drivers/iommu/iommufd/hw_pagetable.c | 105 ++++++++++++++++++++++++ drivers/iommu/iommufd/iommufd_private.h | 29 +++++-- drivers/iommu/iommufd/main.c | 4 + include/uapi/linux/iommufd.h | 23 +++++- 5 files changed, 154 insertions(+), 8 deletions(-)
drivers/iommu/iommufd/device.c +1 -0
@@ -627,6 +627,7 @@ static int iommufd_device_change_pt(struct iommufd_device *idev, u32 *pt_id,return PTR_ERR (pt_obj);switch (pt_obj->type) { +case IOMMUFD_OBJ_HWPT_NESTED :case IOMMUFD_OBJ_HWPT_PAGING : {struct iommufd_hw_pagetable *hwpt = container_of(pt_obj, struct iommufd_hw_pagetable, obj);
drivers/iommu/iommufd/hw_pagetable.c +105 -0
135 lines not on this page · raw message
drivers/iommu/iommufd/iommufd_private.h +23 -6
@@ -124,6 +124,7 @@ enum iommufd_object_type {IOMMUFD_OBJ_ANY =IOMMUFD_OBJ_NONE ,IOMMUFD_OBJ_DEVICE ,IOMMUFD_OBJ_HWPT_PAGING , +IOMMUFD_OBJ_HWPT_NESTED ,IOMMUFD_OBJ_IOAS ,IOMMUFD_OBJ_ACCESS , #ifdef CONFIG_IOMMUFD_TEST
@@ -255,10 +256,16 @@ struct iommufd_hwpt_paging { bool auto_domain : 1; bool enforce_cache_coherency : 1; bool msi_cookie : 1; + bool nest_parent : 1;/* Head at iommufd_ioas::hwpt_list */ struct list_head hwpt_item; }; +struct iommufd_hwpt_nested { +struct iommufd_hw_pagetable common; +struct iommufd_hwpt_paging *parent; +}; +static inline bool hwpt_is_paging (struct iommufd_hw_pagetable *hwpt) {return hwpt->obj.type ==IOMMUFD_OBJ_HWPT_PAGING ;
@@ -290,18 +297,28 @@ struct iommufd_hw_pagetable * iommufd_hw_pagetable_detach(struct iommufd_device *idev);void iommufd_hwpt_paging_destroy (struct iommufd_object *obj);void iommufd_hwpt_paging_abort (struct iommufd_object *obj); +void iommufd_hwpt_nested_destroy (struct iommufd_object *obj); +void iommufd_hwpt_nested_abort (struct iommufd_object *obj);int iommufd_hwpt_alloc (struct iommufd_ucmd *ucmd);static inline void iommufd_hw_pagetable_put (struct iommufd_ctx *ictx,struct iommufd_hw_pagetable *hwpt) { -struct iommufd_hwpt_paging *hwpt_paging =to_hwpt_paging (hwpt); +if (WARN_ON (hwpt->obj.type !=IOMMUFD_OBJ_HWPT_PAGING && + hwpt->obj.type !=IOMMUFD_OBJ_HWPT_NESTED )) +return ; -lockdep_assert_not_held (&hwpt_paging->ioas->mutex); -if (hwpt_paging->auto_domain) -iommufd_object_deref_user (ictx, &hwpt->obj); -else -refcount_dec (&hwpt->obj.users); +if (hwpt->obj.type ==IOMMUFD_OBJ_HWPT_PAGING ) { +struct iommufd_hwpt_paging *hwpt_paging =to_hwpt_paging (hwpt); + +lockdep_assert_not_held (&hwpt_paging->ioas->mutex); + +if (hwpt_paging->auto_domain) { +iommufd_object_deref_user (ictx, &hwpt->obj); +return ; + } + } +refcount_dec (&hwpt->obj.users); }struct iommufd_group {
drivers/iommu/iommufd/main.c +4 -0
@@ -492,6 +492,10 @@ static const struct iommufd_object_ops iommufd_object_ops[] = { .destroy = iommufd_hwpt_paging_destroy, .abort = iommufd_hwpt_paging_abort, }, + [IOMMUFD_OBJ_HWPT_NESTED] = { + .destroy = iommufd_hwpt_nested_destroy, + .abort = iommufd_hwpt_nested_abort, + }, #ifdef CONFIG_IOMMUFD_TEST [IOMMUFD_OBJ_SELFTEST] = { .destroy = iommufd_selftest_destroy,
include/uapi/linux/iommufd.h +21 -2
@@ -374,15 +374,31 @@ enum iommu_hwpt_data_type {* @size: sizeof(struct iommu_hwpt_alloc) * @flags: Combination of enum iommufd_hwpt_alloc_flags * @dev_id: The device to allocate this HWPT for -* @pt_id: The IOAS to connect this HWPT to +* @pt_id: The IOAS or HWPT to connect this HWPT to * @out_hwpt_id: The ID of the new HWPT * @__reserved: Must be 0 +* @data_type: One of enum iommu_hwpt_data_type +* @data_len: Length of the type specific data +* @data_uptr: User pointer to the type specific data * * Explicitly allocate a hardware page table object. This is the same object * type that is returned by iommufd_device_attach() and represents the * underlying iommu driver's iommu_domain kernel object. * -* A HWPT will be created with the IOVA mappings from the given IOAS. +* A kernel-managed HWPT will be created with the mappings from the given +* IOAS via the @pt_id. The @data_type for this allocation must be set to +* IOMMU_HWPT_DATA_NONE. The HWPT can be allocated as a parent HWPT for a +* nesting configuration by passing IOMMU_HWPT_ALLOC_NEST_PARENT via @flags. +* +* A user-managed nested HWPT will be created from a given parent HWPT via +* @pt_id, in which the parent HWPT must be allocated previously via the +* same ioctl from a given IOAS (@pt_id). In this case, the @data_type +* must be set to a pre-defined type corresponding to an I/O page table +* type supported by the underlying IOMMU hardware. +* +* If the @data_type is set to IOMMU_HWPT_DATA_NONE, @data_len and +* @data_uptr should be zero. Otherwise, both @data_len and @data_uptr +* must be given. */ struct iommu_hwpt_alloc {__u32 size;
@@ -391,6 +407,9 @@ struct iommu_hwpt_alloc {__u32 pt_id;__u32 out_hwpt_id;__u32 __reserved; +__u32 data_type; +__u32 data_len; +__aligned_u64 data_uptr; };#define IOMMU_HWPT_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_ALLOC)
Signature · 1 line
2.34.1
Jason Gunthorpe
maintainerRe: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
Quoted 5 lines · Yi Liu
drivers/iommu/iommufd/hw_pagetable.c +5
-0+static struct iommufd_hwpt_nested * +iommufd_hwpt_nested_alloc (struct iommufd_ctx *ictx, +struct iommufd_hwpt_paging *parent, +struct iommufd_device *idev,u32 flags, +const struct iommu_user_data *user_data)
drivers/iommu/iommufd/hw_pagetable.c iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, · line 216
Quoted 10 lines
drivers/iommu/iommufd/hw_pagetable.c +10
-0+{ +const struct iommu_ops *ops =dev_iommu_ops (idev->dev); +struct iommufd_hwpt_nested *hwpt_nested; +struct iommufd_hw_pagetable *hwpt; +int rc; + +if (flags !=0 ) +return ERR_PTR (-EOPNOTSUPP ); +if (!user_data) +return ERR_PTR (-EINVAL );
user_data is never NULL now, I removed this
drivers/iommu/iommufd/hw_pagetable.c iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, · line 222
Quoted 6 lines
drivers/iommu/iommufd/hw_pagetable.c +6
-0+if (user_data->type ==IOMMU_HWPT_DATA_NONE ) +return ERR_PTR (-EINVAL ); +if (parent->auto_domain) +return ERR_PTR (-EINVAL ); +if (!parent->nest_parent) +return ERR_PTR (-EINVAL );
And put these all together
if (flags || user_data->type == IOMMU_HWPT_DATA_NONE || !ops->domain_alloc_user) return ERR_PTR(-EOPNOTSUPP); if (parent->auto_domain || !parent->nest_parent) return ERR_PTR(-EINVAL);
Quoted 5 lines
drivers/iommu/iommufd/hw_pagetable.c +5
-0+ +if (!ops->domain_alloc_user) +return ERR_PTR (-EOPNOTSUPP ); + + hwpt_nested = __iommufd_object_alloc(ictx, hwpt_nested,
drivers/iommu/iommufd/hw_pagetable.c iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, · line 237
Quoted 10 lines
drivers/iommu/iommufd/hw_pagetable.c +10
-0+IOMMUFD_OBJ_HWPT_NESTED , + common.obj); +if (IS_ERR (hwpt_nested)) +return ERR_CAST (hwpt_nested); + hwpt = &hwpt_nested->common; + +refcount_inc (&parent->common.obj.users); + hwpt_nested->parent = parent; + + hwpt->domain = ops->domain_alloc_user(idev->dev, 0,
And we may as well pass flags here even though we know it is 0 today.
Jason
Jason Gunthorpe
maintainerRe: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
In reply to Yi Liudrivers/iommu/iommufd/hw_pagetable.c int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) · line 288
Quoted 11 lines · Yi Liu
drivers/iommu/iommufd/hw_pagetable.c +4
-0@@ -195,6 +279,10 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)if (pt_obj->type ==IOMMUFD_OBJ_IOAS ) {struct iommufd_hwpt_paging *hwpt_paging; +if (cmd->data_type !=IOMMU_HWPT_DATA_NONE ) { + rc = -EINVAL ; + goto out_put_pt; + } ioas = container_of(pt_obj, struct iommufd_ioas, obj);mutex_lock (&ioas->mutex); hwpt_paging = iommufd_hwpt_paging_alloc(ucmd->ictx, ioas, idev,
?? What is this?
Ah something went wrong earlier in "iommu: Pass in parent domain with user_data to domain_alloc_user op"
Once we added the user_data we should flow it through to the op always.
Jason
Re: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
Quoted 15 lines · Jason Gunthorpe
drivers/iommu/iommufd/hw_pagetable.c int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) · line 288
Quoted 11 lines · Yi Liu
drivers/iommu/iommufd/hw_pagetable.c +4
-0@@ -195,6 +279,10 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)if (pt_obj->type ==IOMMUFD_OBJ_IOAS ) {struct iommufd_hwpt_paging *hwpt_paging; +if (cmd->data_type !=IOMMU_HWPT_DATA_NONE ) { + rc = -EINVAL ; + goto out_put_pt; + } ioas = container_of(pt_obj, struct iommufd_ioas, obj);mutex_lock (&ioas->mutex); hwpt_paging = iommufd_hwpt_paging_alloc(ucmd->ictx, ioas, idev,?? What is this?
Quoted 5 lines
Ah something went wrong earlier in "iommu: Pass in parent domain with
user_datatodomain_alloc_userop"Once we added the
user_datawe should flow it through to the op always.
Hmm, iommufd_hwpt_paging_alloc doesn't take (or need) user_data, but we could pass in a dummy one if that looks better?
Thanks
Nicolin
Jason Gunthorpe
maintainerRe: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
Quoted 16 lines · Nicolin Chen
Quoted 15 lines · Jason Gunthorpe
drivers/iommu/iommufd/hw_pagetable.c int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) · line 288
Quoted 11 lines · Yi Liu
drivers/iommu/iommufd/hw_pagetable.c +4
-0@@ -195,6 +279,10 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)if (pt_obj->type ==IOMMUFD_OBJ_IOAS ) {struct iommufd_hwpt_paging *hwpt_paging; +if (cmd->data_type !=IOMMU_HWPT_DATA_NONE ) { + rc = -EINVAL ; + goto out_put_pt; + } ioas = container_of(pt_obj, struct iommufd_ioas, obj);mutex_lock (&ioas->mutex); hwpt_paging = iommufd_hwpt_paging_alloc(ucmd->ictx, ioas, idev,?? What is this?
Quoted 8 lines
Quoted 5 lines
Ah something went wrong earlier in "iommu: Pass in parent domain with
user_datatodomain_alloc_userop"Once we added the
user_datawe should flow it through to the op always.Hmm,
iommufd_hwpt_paging_allocdoesn't take (or need)user_data, but we could pass in a dummy one if that looks better?
The point is for the user_data to always be available, the driver needs to check it if it is passed.
This should all be plumbed to allow drivers to also customize their paging domains too.
Jason
Re: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
Quoted 23 lines · Jason Gunthorpe
Quoted 22 lines · Nicolin Chen
Quoted 20 lines · Jason Gunthorpe
drivers/iommu/iommufd/hw_pagetable.c int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) · line 288
Quoted 11 lines · Yi Liu
drivers/iommu/iommufd/hw_pagetable.c +4
-0@@ -195,6 +279,10 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)if (pt_obj->type ==IOMMUFD_OBJ_IOAS ) {struct iommufd_hwpt_paging *hwpt_paging; +if (cmd->data_type !=IOMMU_HWPT_DATA_NONE ) { + rc = -EINVAL ; + goto out_put_pt; + } ioas = container_of(pt_obj, struct iommufd_ioas, obj);mutex_lock (&ioas->mutex); hwpt_paging = iommufd_hwpt_paging_alloc(ucmd->ictx, ioas, idev,?? What is this?
Ah something went wrong earlier in "iommu: Pass in parent domain with
user_datatodomain_alloc_userop"Once we added the
user_datawe should flow it through to the op always.
Quoted 8 lines
Quoted 2 lines
Hmm,
iommufd_hwpt_paging_allocdoesn't take (or need)user_data, but we could pass in a dummy one if that looks better?The point is for the
user_datato always be available, the driver needs to check it if it is passed.This should all be plumbed to allow drivers to also customize their paging domains too.
We don't have a use case of customizing the paging domains. And our selftest isn't covering this path. Nor the case is supported by the uAPI:
458- * A kernel-managed HWPT will be created with the mappings from the given 459- * IOAS via the @pt_id. The @data_type for this allocation must be set to 460: * IOMMU_HWPT_DATA_NONE. The HWPT can be allocated as a parent HWPT for a 461- * nesting configuration by passing IOMMU_HWPT_ALLOC_NEST_PARENT via @flags. 462- *
Also, if we do passing in the data, we'd need to...
280-static struct iommu_domain * 281-mock_domain_alloc_user(struct device *dev, u32 flags,
282- struct iommu_domain *parent,
283: const struct iommu_user_data *user_data)
284-{
285- struct mock_iommu_domain *mock_parent;
286- struct iommu_hwpt_selftest user_cfg;
287- int rc;
288-
289: if (!user_data) { /* must be mock_domain */
...change this to if (!parent)...
290- struct mock_dev *mdev = container_of(dev, struct mock_dev, dev);
291- bool has_dirty_flag = flags & IOMMU_HWPT_ALLOC_DIRTY_TRACKING;
292- bool no_dirty_ops = mdev->flags & MOCK_FLAGS_DEVICE_NO_DIRTY;
293-
294- if (parent)
295- return ERR_PTR(-EINVAL);
...and drop this.
296- if (has_dirty_flag && no_dirty_ops)
297- return ERR_PTR(-EOPNOTSUPP);
298- return __mock_domain_alloc_paging(IOMMU_DOMAIN_UNMANAGED,
299- has_dirty_flag);
300- }
301-
302- /* must be mock_domain_nested */
303: if (user_data->type != IOMMU_HWPT_DATA_SELFTEST)
304- return ERR_PTR(-EOPNOTSUPP);
Thanks
Nicolin
Jason Gunthorpe
maintainerRe: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
Quoted 9 lines · Nicolin Chen
Quoted 5 lines
The point is for the
user_datato always be available, the driver needs to check it if it is passed.This should all be plumbed to allow drivers to also customize their paging domains too.
We don't have a use case of customizing the paging domains. And our selftest isn't covering this path. Nor the case is supported by the uAPI:
But this is the design, it is why everything is setup like this - we didn't create a new op to allocate nesting domains, we made a flexible user allocator.
Quoted 5 lines
458- * A kernel-managed HWPT will be created with the mappings from the given 459- * IOAS via the @pt_id. The @data_type for this allocation must be set to 460: *
IOMMU_HWPT_DATA_NONE. The HWPT can be allocated as a parent HWPT for a 461- * nesting configuration by passingIOMMU_HWPT_ALLOC_NEST_PARENTvia @flags. 462- *
Yes, that is the reality today. If someone comes to use the more complete interface they need to fix that comment..
Quoted 13 lines
Also, if we do passing in the data, we'd need to...
280-static struct
iommu_domain* 281-mock_domain_alloc_user(struct device *dev, u32 flags,
282- structiommu_domain*parent,
283: const structiommu_user_data*user_data)
284-{
285- structmock_iommu_domain*mock_parent;
286- structiommu_hwpt_selftestuser_cfg;
287- int rc;
288-
289: if (!user_data) { /* must bemock_domain*/
Quoted 1 line
...change this to if (!parent)...
Yes, this logic is not ideal. The parent is the request for nesting, not user_data. user_data is the generic creation parameters, which are not supported outside nesting
Like this:
drivers/iommu/iommufd/selftest.c +2 -4
@@ -286,14 +286,12 @@ mock_domain_alloc_user(struct device *dev, u32 flags,int rc;/* must be mock_domain */ -if (!user_data) { +if (!parent) { struct mock_dev *mdev = container_of(dev, struct mock_dev, dev);bool has_dirty_flag = flags &IOMMU_HWPT_ALLOC_DIRTY_TRACKING ;bool no_dirty_ops = mdev->flags &MOCK_FLAGS_DEVICE_NO_DIRTY ; -if (parent) -return ERR_PTR (-EINVAL ); -if (has_dirty_flag && no_dirty_ops) +if (user_data || (has_dirty_flag && no_dirty_ops))return ERR_PTR (-EOPNOTSUPP );return __mock_domain_alloc_paging (IOMMU_DOMAIN_UNMANAGED , has_dirty_flag);
Thanks,
Jason
Re: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
Quoted 16 lines · Jason Gunthorpe
Quoted 9 lines · Nicolin Chen
Quoted 5 lines
The point is for the
user_datato always be available, the driver needs to check it if it is passed.This should all be plumbed to allow drivers to also customize their paging domains too.
We don't have a use case of customizing the paging domains. And our selftest isn't covering this path. Nor the case is supported by the uAPI:
But this is the design, it is why everything is setup like this - we didn't create a new op to allocate nesting domains, we made a flexible user allocator.
Quoted 8 lines
Quoted 5 lines
458- * A kernel-managed HWPT will be created with the mappings from the given 459- * IOAS via the @pt_id. The @data_type for this allocation must be set to 460: *
IOMMU_HWPT_DATA_NONE. The HWPT can be allocated as a parent HWPT for a 461- * nesting configuration by passingIOMMU_HWPT_ALLOC_NEST_PARENTvia @flags. 462- *Yes, that is the reality today. If someone comes to use the more complete interface they need to fix that comment..
Ack.
Quoted 30 lines
Quoted 13 lines
Also, if we do passing in the data, we'd need to...
280-static struct
iommu_domain* 281-mock_domain_alloc_user(struct device *dev, u32 flags,
282- structiommu_domain*parent,
283: const structiommu_user_data*user_data)
284-{
285- structmock_iommu_domain*mock_parent;
286- structiommu_hwpt_selftestuser_cfg;
287- int rc;
288-
289: if (!user_data) { /* must bemock_domain*/Quoted 1 line
...change this to if (!parent)...
Yes, this logic is not ideal. The parent is the request for nesting, not
user_data.user_datais the generic creation parameters, which are not supported outside nestingLike this:
drivers/iommu/iommufd/selftest.c +1
-1@@ -286,14 +286,12 @@ mock_domain_alloc_user(struct device *dev, u32 flags,int rc;/* must be mock_domain */ -if (!user_data) { +if (!parent) { struct mock_dev *mdev = container_of(dev, struct mock_dev, dev);
drivers/iommu/iommufd/selftest.c mock_domain_alloc_user(struct device *dev, u32 flags, · line 297
Quoted 10 lines
drivers/iommu/iommufd/selftest.c +1
-3bool has_dirty_flag = flags &IOMMU_HWPT_ALLOC_DIRTY_TRACKING ;bool no_dirty_ops = mdev->flags &MOCK_FLAGS_DEVICE_NO_DIRTY ; -if (parent) -return ERR_PTR (-EINVAL ); -if (has_dirty_flag && no_dirty_ops) +if (user_data || (has_dirty_flag && no_dirty_ops))return ERR_PTR (-EOPNOTSUPP );return __mock_domain_alloc_paging (IOMMU_DOMAIN_UNMANAGED , has_dirty_flag);
Yea.. Then the vt-d driver needs a similar change too (@Yi) as I found it almost doing the same:
https://lore.kernel.org/linux-iommu/[email protected]/
Thanks
Nic
Re: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
Quoted 61 lines · Nicolin Chen
Quoted 16 lines · Jason Gunthorpe
Quoted 9 lines · Nicolin Chen
Quoted 5 lines
The point is for the
user_datato always be available, the driver needs to check it if it is passed.This should all be plumbed to allow drivers to also customize their paging domains too.
We don't have a use case of customizing the paging domains. And our selftest isn't covering this path. Nor the case is supported by the uAPI:
But this is the design, it is why everything is setup like this - we didn't create a new op to allocate nesting domains, we made a flexible user allocator.
Quoted 8 lines
Quoted 5 lines
458- * A kernel-managed HWPT will be created with the mappings from the given 459- * IOAS via the @pt_id. The @data_type for this allocation must be set to 460: *
IOMMU_HWPT_DATA_NONE. The HWPT can be allocated as a parent HWPT for a 461- * nesting configuration by passingIOMMU_HWPT_ALLOC_NEST_PARENTvia @flags. 462- *Yes, that is the reality today. If someone comes to use the more complete interface they need to fix that comment..
Ack.
Quoted 33 lines
Quoted 13 lines
Also, if we do passing in the data, we'd need to...
280-static struct
iommu_domain* 281-mock_domain_alloc_user(struct device *dev, u32 flags,
282- structiommu_domain*parent,
283: const structiommu_user_data*user_data)
284-{
285- structmock_iommu_domain*mock_parent;
286- structiommu_hwpt_selftestuser_cfg;
287- int rc;
288-
289: if (!user_data) { /* must bemock_domain*/Quoted 1 line
...change this to if (!parent)...
Yes, this logic is not ideal. The parent is the request for nesting, not
user_data.user_datais the generic creation parameters, which are not supported outside nestingLike this:
drivers/iommu/iommufd/selftest.c +1
-1@@ -286,14 +286,12 @@ mock_domain_alloc_user(struct device *dev, u32 flags,int rc;/* must be mock_domain */ -if (!user_data) { +if (!parent) { struct mock_dev *mdev = container_of(dev, struct mock_dev, dev);bool has_dirty_flag = flags &IOMMU_HWPT_ALLOC_DIRTY_TRACKING ;bool no_dirty_ops = mdev->flags &MOCK_FLAGS_DEVICE_NO_DIRTY ;
Quoted 12 lines
drivers/iommu/iommufd/selftest.c mock_domain_alloc_user(struct device *dev, u32 flags, · line 297
Quoted 7 lines
drivers/iommu/iommufd/selftest.c +1
-3-if (parent) -return ERR_PTR (-EINVAL ); -if (has_dirty_flag && no_dirty_ops) +if (user_data || (has_dirty_flag && no_dirty_ops))return ERR_PTR (-EOPNOTSUPP );return __mock_domain_alloc_paging (IOMMU_DOMAIN_UNMANAGED , has_dirty_flag);Yea.. Then the vt-d driver needs a similar change too (@Yi) as I found it almost doing the same:
https://lore.kernel.org/linux-iommu/[email protected]/
yes. mock driver is kind of sample code, so the intel iommu driver is doing almost the same thing. will follow up with the branch Jason shared.
Signature · 2 lines
Regards, Yi Liu
Jason Gunthorpe
maintainerRe: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
In reply to Jason GunthorpeQuoted 15 lines · Jason Gunthorpe
Review int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) · line 288
Quoted 11 lines · Yi Liu
(quoted diff) +4
-0@@ -195,6 +279,10 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) if (pt_obj->type == IOMMUFD_OBJ_IOAS) { struct iommufd_hwpt_paging *hwpt_paging; + if (cmd->data_type != IOMMU_HWPT_DATA_NONE) { + rc = -EINVAL; + goto out_put_pt; + } ioas = container_of(pt_obj, struct iommufd_ioas, obj); mutex_lock(&ioas->mutex); hwpt_paging = iommufd_hwpt_paging_alloc(ucmd->ictx, ioas, idev,?? What is this?
Quoted 2 lines
Ah something went wrong earlier in "iommu: Pass in parent domain with
user_datatodomain_alloc_userop"
Bah, I got confused because that had half the uapi, so in this pathc
Quoted 2 lines
Once we added the
user_datawe should flow it through to the op always.
Like this:
drivers/iommu/iommufd/device.c +2 -2
@@ -586,8 +586,8 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev, goto out_unlock; } - hwpt_paging =iommufd_hwpt_paging_alloc (idev->ictx, ioas, idev, -0 , immediate_attach); + hwpt_paging =iommufd_hwpt_paging_alloc (idev->ictx, ioas, idev,0 , + immediate_attach,NULL );if (IS_ERR (hwpt_paging)) { destroy_hwpt =ERR_CAST (hwpt_paging); goto out_unlock;
drivers/iommu/iommufd/hw_pagetable.c +13 -16
@@ -96,7 +96,8 @@ iommufd_hwpt_paging_enforce_cc(struct iommufd_hwpt_paging *hwpt_paging)struct iommufd_hwpt_paging *iommufd_hwpt_paging_alloc (struct iommufd_ctx *ictx,struct iommufd_ioas *ioas,struct iommufd_device *idev,u32 flags, -bool immediate_attach) +bool immediate_attach, +const struct iommu_user_data *user_data) {const u32 valid_flags =IOMMU_HWPT_ALLOC_NEST_PARENT |IOMMU_HWPT_ALLOC_DIRTY_TRACKING ;
@@ -107,7 +108,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,lockdep_assert_held (&ioas->mutex); -if (flags && !ops->domain_alloc_user) +if ((flags || user_data) && !ops->domain_alloc_user)return ERR_PTR (-EOPNOTSUPP );if (flags & ~valid_flags)return ERR_PTR (-EOPNOTSUPP );
@@ -127,7 +128,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,if (ops->domain_alloc_user) { hwpt->domain = ops->domain_alloc_user (idev->dev, flags, -NULL ,NULL ); +NULL , user_data);if (IS_ERR (hwpt->domain)) { rc =PTR_ERR (hwpt->domain); hwpt->domain =NULL ;
@@ -210,8 +211,7 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx,struct iommufd_hw_pagetable *hwpt;int rc; -if (flags || user_data->type ==IOMMU_HWPT_DATA_NONE || - !ops->domain_alloc_user) +if (flags || !user_data->len || !ops->domain_alloc_user)return ERR_PTR (-EOPNOTSUPP );if (parent->auto_domain || !parent->nest_parent)return ERR_PTR (-EINVAL );
@@ -249,6 +249,11 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx,int iommufd_hwpt_alloc (struct iommufd_ucmd *ucmd) {struct iommu_hwpt_alloc *cmd = ucmd->cmd; +const struct iommu_user_data user_data = { + .type = cmd->data_type, + .uptr =u64_to_user_ptr (cmd->data_uptr), + .len = cmd->data_len, + };struct iommufd_hw_pagetable *hwpt;struct iommufd_ioas *ioas =NULL ;struct iommufd_object *pt_obj;
@@ -273,25 +278,17 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)if (pt_obj->type ==IOMMUFD_OBJ_IOAS ) {struct iommufd_hwpt_paging *hwpt_paging; -if (cmd->data_type !=IOMMU_HWPT_DATA_NONE ) { - rc = -EINVAL ; - goto out_put_pt; - } ioas = container_of(pt_obj, struct iommufd_ioas, obj);mutex_lock (&ioas->mutex); - hwpt_paging =iommufd_hwpt_paging_alloc (ucmd->ictx, ioas, idev, - cmd->flags, false); + hwpt_paging =iommufd_hwpt_paging_alloc ( + ucmd->ictx, ioas, idev, cmd->flags, false, + user_data.len ? &user_data :NULL );if (IS_ERR (hwpt_paging)) { rc =PTR_ERR (hwpt_paging); goto out_unlock; } hwpt = &hwpt_paging->common; }else if (pt_obj->type ==IOMMUFD_OBJ_HWPT_PAGING ) { -const struct iommu_user_data user_data = { - .type = cmd->data_type, - .uptr =u64_to_user_ptr (cmd->data_uptr), - .len = cmd->data_len, - };struct iommufd_hwpt_nested *hwpt_nested;struct iommufd_hwpt_paging *parent;
drivers/iommu/iommufd/iommufd_private.h +2 -1
@@ -290,7 +290,8 @@ int iommufd_hwpt_get_dirty_bitmap(struct iommufd_ucmd *ucmd);struct iommufd_hwpt_paging *iommufd_hwpt_paging_alloc (struct iommufd_ctx *ictx,struct iommufd_ioas *ioas,struct iommufd_device *idev,u32 flags, -bool immediate_attach); +bool immediate_attach, +const struct iommu_user_data *user_data);int iommufd_hw_pagetable_attach (struct iommufd_hw_pagetable *hwpt,struct iommufd_device *idev); struct iommufd_hw_pagetable *
Re: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
Quoted 19 lines · Jason Gunthorpe
Quoted 15 lines · Jason Gunthorpe
drivers/iommu/iommufd/hw_pagetable.c int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) · line 288
Quoted 11 lines · Yi Liu
drivers/iommu/iommufd/hw_pagetable.c +4
-0@@ -195,6 +279,10 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)if (pt_obj->type ==IOMMUFD_OBJ_IOAS ) {struct iommufd_hwpt_paging *hwpt_paging; +if (cmd->data_type !=IOMMU_HWPT_DATA_NONE ) { + rc = -EINVAL ; + goto out_put_pt; + } ioas = container_of(pt_obj, struct iommufd_ioas, obj);mutex_lock (&ioas->mutex); hwpt_paging = iommufd_hwpt_paging_alloc(ucmd->ictx, ioas, idev,?? What is this?
Quoted 2 lines
Ah something went wrong earlier in "iommu: Pass in parent domain with
user_datatodomain_alloc_userop"
Quoted 6 lines
Bah, I got confused because that had half the uapi, so in this pathc
Quoted 2 lines
Once we added the
user_datawe should flow it through to the op always.Like this:
ack.
Quoted 70 lines
drivers/iommu/iommufd/device.c +2
-2@@ -586,8 +586,8 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev, goto out_unlock; } - hwpt_paging =iommufd_hwpt_paging_alloc (idev->ictx, ioas, idev, -0 , immediate_attach); + hwpt_paging =iommufd_hwpt_paging_alloc (idev->ictx, ioas, idev,0 , + immediate_attach,NULL );if (IS_ERR (hwpt_paging)) { destroy_hwpt =ERR_CAST (hwpt_paging); goto out_unlock;drivers/iommu/iommufd/hw_pagetable.c +10
-5@@ -96,7 +96,8 @@ iommufd_hwpt_paging_enforce_cc(struct iommufd_hwpt_paging *hwpt_paging)struct iommufd_hwpt_paging *iommufd_hwpt_paging_alloc (struct iommufd_ctx *ictx,struct iommufd_ioas *ioas,struct iommufd_device *idev,u32 flags, -bool immediate_attach) +bool immediate_attach, +const struct iommu_user_data *user_data) {const u32 valid_flags =IOMMU_HWPT_ALLOC_NEST_PARENT |IOMMU_HWPT_ALLOC_DIRTY_TRACKING ;@@ -107,7 +108,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,lockdep_assert_held (&ioas->mutex); -if (flags && !ops->domain_alloc_user) +if ((flags || user_data) && !ops->domain_alloc_user)return ERR_PTR (-EOPNOTSUPP );if (flags & ~valid_flags)return ERR_PTR (-EOPNOTSUPP );@@ -127,7 +128,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,if (ops->domain_alloc_user) { hwpt->domain = ops->domain_alloc_user (idev->dev, flags, -NULL ,NULL ); +NULL , user_data);if (IS_ERR (hwpt->domain)) { rc =PTR_ERR (hwpt->domain); hwpt->domain =NULL ;@@ -210,8 +211,7 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx,struct iommufd_hw_pagetable *hwpt;int rc; -if (flags || user_data->type ==IOMMU_HWPT_DATA_NONE || - !ops->domain_alloc_user) +if (flags || !user_data->len || !ops->domain_alloc_user)return ERR_PTR (-EOPNOTSUPP );if (parent->auto_domain || !parent->nest_parent)return ERR_PTR (-EINVAL );@@ -249,6 +249,11 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx,int iommufd_hwpt_alloc (struct iommufd_ucmd *ucmd) {struct iommu_hwpt_alloc *cmd = ucmd->cmd; +const struct iommu_user_data user_data = { + .type = cmd->data_type, + .uptr =u64_to_user_ptr (cmd->data_uptr), + .len = cmd->data_len, + };struct iommufd_hw_pagetable *hwpt;struct iommufd_ioas *ioas =NULL ;struct iommufd_object *pt_obj;
drivers/iommu/iommufd/hw_pagetable.c int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) · line 279
Quoted 7 lines
drivers/iommu/iommufd/hw_pagetable.c +0
-4@@ -273,25 +278,17 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)if (pt_obj->type ==IOMMUFD_OBJ_IOAS ) {struct iommufd_hwpt_paging *hwpt_paging; -if (cmd->data_type !=IOMMU_HWPT_DATA_NONE ) { - rc = -EINVAL ; - goto out_put_pt; - }
it can be covered by iommu driver when checking user data pointer. hence remove above if.
Quoted 35 lines
drivers/iommu/iommufd/hw_pagetable.c +3
-7ioas = container_of(pt_obj, struct iommufd_ioas, obj);mutex_lock (&ioas->mutex); - hwpt_paging =iommufd_hwpt_paging_alloc (ucmd->ictx, ioas, idev, - cmd->flags, false); + hwpt_paging =iommufd_hwpt_paging_alloc ( + ucmd->ictx, ioas, idev, cmd->flags, false, + user_data.len ? &user_data :NULL );if (IS_ERR (hwpt_paging)) { rc =PTR_ERR (hwpt_paging); goto out_unlock; } hwpt = &hwpt_paging->common; }else if (pt_obj->type ==IOMMUFD_OBJ_HWPT_PAGING ) { -const struct iommu_user_data user_data = { - .type = cmd->data_type, - .uptr =u64_to_user_ptr (cmd->data_uptr), - .len = cmd->data_len, - };struct iommufd_hwpt_nested *hwpt_nested;struct iommufd_hwpt_paging *parent;drivers/iommu/iommufd/iommufd_private.h +2
-1@@ -290,7 +290,8 @@ int iommufd_hwpt_get_dirty_bitmap(struct iommufd_ucmd *ucmd);struct iommufd_hwpt_paging *iommufd_hwpt_paging_alloc (struct iommufd_ctx *ictx,struct iommufd_ioas *ioas,struct iommufd_device *idev,u32 flags, -bool immediate_attach); +bool immediate_attach, +const struct iommu_user_data *user_data);int iommufd_hw_pagetable_attach (struct iommufd_hw_pagetable *hwpt,struct iommufd_device *idev); struct iommufd_hw_pagetable *
Signature · 2 lines
Regards, Yi Liu
Jason Gunthorpe
maintainerRe: [PATCH v6 07/10] iommufd: Add a nested HW pagetable object
In reply to Yi Liudrivers/iommu/iommufd/iommufd_private.h struct iommufd_hw_pagetable * · line 309
Quoted 7 lines · Yi Liu
static inline void iommufd_hw_pagetable_put(struct
iommufd_ctx*ictx,drivers/iommu/iommufd/iommufd_private.h +3
-1struct iommufd_hw_pagetable *hwpt) { -struct iommufd_hwpt_paging *hwpt_paging =to_hwpt_paging (hwpt); +if (WARN_ON (hwpt->obj.type !=IOMMUFD_OBJ_HWPT_PAGING && + hwpt->obj.type !=IOMMUFD_OBJ_HWPT_NESTED )) +return ;
This is redundant, we have a C type, no need to check the type field like this
Jason
PATCH v6 8/10 iommu: Add iommu_copy_struct_from_user helper
In reply to Yi LiuFrom: Nicolin Chen <[email protected]>
Wrap up the data type/pointer/len sanity and a copy_struct_from_user call for iommu drivers to copy driver specific data via struct iommu_user_data. And expect it to be used in the domain_alloc_user op for example.
--- include/linux/iommu.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
include/linux/iommu.h +41 -0
@@ -280,6 +280,47 @@ struct iommu_user_data {size_t len; }; +/** +* __iommu_copy_struct_from_user - Copy iommu driver specific user space data +* @dst_data: Pointer to an iommu driver specific user data that is defined in +* include/uapi/linux/iommufd.h +* @src_data: Pointer to a struct iommu_user_data for user space data info +* @data_type: The data type of the @dst_data. Must match with @src_data.type +* @data_len: Length of current user data structure, i.e. sizeof(struct _dst) +* @min_len: Initial length of user data structure for backward compatibility. +* This should be offsetofend using the last member in the user data +* struct that was initially added to include/uapi/linux/iommufd.h +*/ +static inline int +__iommu_copy_struct_from_user (void *dst_data, +const struct iommu_user_data *src_data, +unsigned int data_type,size_t data_len, +size_t min_len) +{ +if (src_data->type != data_type) +return -EINVAL ; +if (WARN_ON (!dst_data || !src_data)) +return -EINVAL ; +if (src_data->len < min_len || data_len < src_data->len) +return -EINVAL ; +return copy_struct_from_user (dst_data, data_len, + src_data->uptr, src_data->len); +} + +/** +* iommu_copy_struct_from_user - Copy iommu driver specific user space data +* @kdst: Pointer to an iommu driver specific user data that is defined in +* include/uapi/linux/iommufd.h +* @user_data: Pointer to a struct iommu_user_data for user space data info +* @data_type: The data type of the @kdst. Must match with @user_data->type +* @min_last: The last memember of the data structure @kdst points in the +* initial version. +* Return 0 for success, otherwise -error. +*/ +#define iommu_copy_struct_from_user (kdst, user_data, data_type, min_last) \ + __iommu_copy_struct_from_user(kdst, user_data, data_type, sizeof(*kdst), \ + offsetofend(typeof(*kdst), min_last)) +/** * struct iommu_ops - iommu ops and capabilities * @capable: check capability
Signature · 1 line
2.34.1
PATCH v6 9/10 iommufd/selftest: Add nested domain allocation for mock domain
In reply to Yi LiuFrom: Nicolin Chen <[email protected]>
Add nested domain support in the ->domain_alloc_user op with some proper sanity checks. Then, add a domain_nested_ops for all nested domains and split the get_md_pagetable helper into paging and nested helpers.
Also, add an iotlb as a testing property of a nested domain.
--- drivers/iommu/iommufd/iommufd_test.h | 18 ++++ drivers/iommu/iommufd/selftest.c | 150 +++++++++++++++++++++------ 2 files changed, 138 insertions(+), 30 deletions(-)
drivers/iommu/iommufd/iommufd_test.h +18 -0
@@ -46,6 +46,11 @@ enum { MOCK_FLAGS_DEVICE_NO_DIRTY = 1 << 0, }; +enum { +MOCK_NESTED_DOMAIN_IOTLB_ID_MAX =3 , +MOCK_NESTED_DOMAIN_IOTLB_NUM =4 , +}; +struct iommu_test_cmd {__u32 size;__u32 op;
@@ -130,4 +135,17 @@ struct iommu_test_hw_info { __u32 test_reg; }; +/* Should not be equal to any defined value in enum iommu_hwpt_data_type */ +#define IOMMU_HWPT_DATA_SELFTEST 0xdead + +/** +* struct iommu_hwpt_selftest +* +* @iotlb: default mock iotlb value, IOMMU_TEST_IOTLB_DEFAULT +*/ +struct iommu_hwpt_selftest { +#define IOMMU_TEST_IOTLB_DEFAULT 0xbadbeef +__u32 iotlb; +}; +#endif
drivers/iommu/iommufd/selftest.c +120 -30
205 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v6 10/10 iommufd/selftest: Add coverage for IOMMU_HWPT_ALLOC with nested HWPTs
In reply to Yi LiuFrom: Nicolin Chen <[email protected]>
The IOMMU_HWPT_ALLOC ioctl now supports passing user_data to allocate a user-managed domain for nested HWPTs. Add its coverage for that. Also, update _test_cmd_hwpt_alloc() and add test_cmd/err_hwpt_alloc_nested().
--- tools/testing/selftests/iommu/iommufd.c | 120 ++++++++++++++++++ .../selftests/iommu/iommufd_fail_nth.c | 3 +- tools/testing/selftests/iommu/iommufd_utils.h | 31 ++++- 3 files changed, 146 insertions(+), 8 deletions(-)
tools/testing/selftests/iommu/iommufd.c +120 -0
@@ -264,6 +264,126 @@ TEST_F(iommufd_ioas, ioas_destroy) } } +TEST_F(iommufd_ioas, alloc_hwpt_nested) +{ +const uint32_t min_data_len = + offsetofend(struct iommu_hwpt_selftest, iotlb); +struct iommu_hwpt_selftest data = { + .iotlb =IOMMU_TEST_IOTLB_DEFAULT , + }; +uint32_t nested_hwpt_id[2 ] = {}; +uint32_t parent_hwpt_id =0 ; +uint32_t parent_hwpt_id_not_work =0 ; +uint32_t test_hwpt_id =0 ; + +if (self->device_id) { +/* Negative tests */ +test_err_hwpt_alloc (ENOENT , self->ioas_id, self->device_id, +0 , &test_hwpt_id); +test_err_hwpt_alloc (EINVAL , self->device_id, + self->device_id,0 , &test_hwpt_id); + +test_cmd_hwpt_alloc (self->device_id, self->ioas_id, +IOMMU_HWPT_ALLOC_NEST_PARENT , + &parent_hwpt_id); + +test_cmd_hwpt_alloc (self->device_id, self->ioas_id, +0 , &parent_hwpt_id_not_work); + +/* Negative nested tests */ +test_err_hwpt_alloc_nested (EINVAL , + self->device_id, parent_hwpt_id, +0 , &nested_hwpt_id[0 ], +IOMMU_HWPT_DATA_NONE , + &data,sizeof (data)); +test_err_hwpt_alloc_nested (EOPNOTSUPP , + self->device_id, parent_hwpt_id, +0 , &nested_hwpt_id[0 ], +IOMMU_HWPT_DATA_SELFTEST +1 , + &data,sizeof (data)); +test_err_hwpt_alloc_nested (EINVAL , + self->device_id, parent_hwpt_id, +0 , &nested_hwpt_id[0 ], +IOMMU_HWPT_DATA_SELFTEST , + &data, min_data_len -1 ); +test_err_hwpt_alloc_nested (EFAULT , + self->device_id, parent_hwpt_id, +0 , &nested_hwpt_id[0 ], +IOMMU_HWPT_DATA_SELFTEST , +NULL ,sizeof (data)); +test_err_hwpt_alloc_nested (EOPNOTSUPP , + self->device_id, parent_hwpt_id, +IOMMU_HWPT_ALLOC_NEST_PARENT , + &nested_hwpt_id[0 ], +IOMMU_HWPT_DATA_SELFTEST , + &data,sizeof (data)); +test_err_hwpt_alloc_nested (EINVAL , self->device_id, + parent_hwpt_id_not_work, +0 , &nested_hwpt_id[0 ], +IOMMU_HWPT_DATA_SELFTEST , + &data,sizeof (data)); + +/* Allocate two nested hwpts sharing one common parent hwpt */ +test_cmd_hwpt_alloc_nested (self->device_id, parent_hwpt_id, +0 , &nested_hwpt_id[0 ], +IOMMU_HWPT_DATA_SELFTEST , + &data,sizeof (data)); +test_cmd_hwpt_alloc_nested (self->device_id, parent_hwpt_id, +0 , &nested_hwpt_id[1 ], +IOMMU_HWPT_DATA_SELFTEST , + &data,sizeof (data)); + +/* Negative test: a nested hwpt on top of a nested hwpt */ +test_err_hwpt_alloc_nested (EINVAL , + self->device_id, nested_hwpt_id[0 ], +0 , &test_hwpt_id, +IOMMU_HWPT_DATA_SELFTEST , + &data,sizeof (data)); +/* Negative test: parent hwpt now cannot be freed */ +EXPECT_ERRNO (EBUSY , +_test_ioctl_destroy (self->fd, parent_hwpt_id)); + +/* Attach device to nested_hwpt_id[0] that then will be busy */ +test_cmd_mock_domain_replace (self->stdev_id, + nested_hwpt_id[0 ]); +EXPECT_ERRNO (EBUSY , +_test_ioctl_destroy (self->fd, nested_hwpt_id[0 ])); + +/* Switch from nested_hwpt_id[0] to nested_hwpt_id[1] */ +test_cmd_mock_domain_replace (self->stdev_id, + nested_hwpt_id[1 ]); +EXPECT_ERRNO (EBUSY , +_test_ioctl_destroy (self->fd, nested_hwpt_id[1 ])); +test_ioctl_destroy (nested_hwpt_id[0 ]); + +/* Detach from nested_hwpt_id[1] and destroy it */ +test_cmd_mock_domain_replace (self->stdev_id, parent_hwpt_id); +test_ioctl_destroy (nested_hwpt_id[1 ]); + +/* Detach from the parent hw_pagetable and destroy it */ +test_cmd_mock_domain_replace (self->stdev_id, self->ioas_id); +test_ioctl_destroy (parent_hwpt_id); +test_ioctl_destroy (parent_hwpt_id_not_work); + }else { +test_err_hwpt_alloc (ENOENT , self->device_id, self->ioas_id, +0 , &parent_hwpt_id); +test_err_hwpt_alloc_nested (ENOENT , + self->device_id, parent_hwpt_id, +0 , &nested_hwpt_id[0 ], +IOMMU_HWPT_DATA_SELFTEST , + &data,sizeof (data)); +test_err_hwpt_alloc_nested (ENOENT , + self->device_id, parent_hwpt_id, +0 , &nested_hwpt_id[1 ], +IOMMU_HWPT_DATA_SELFTEST , + &data,sizeof (data)); +test_err_mock_domain_replace (ENOENT , + self->stdev_id, nested_hwpt_id[0 ]); +test_err_mock_domain_replace (ENOENT , + self->stdev_id, nested_hwpt_id[1 ]); + } +} + TEST_F(iommufd_ioas, hwpt_attach) {/* Create a device attached directly to a hwpt */
tools/testing/selftests/iommu/iommufd_fail_nth.c +2 -1
@@ -615,7 +615,8 @@ TEST_FAIL_NTH(basic_fail_nth, device)if (_test_cmd_get_hw_info (self->fd, idev_id, &info,sizeof (info),NULL ))return -1 ; -if (_test_cmd_hwpt_alloc (self->fd, idev_id, ioas_id,0 , &hwpt_id)) +if (_test_cmd_hwpt_alloc (self->fd, idev_id, ioas_id,0 , &hwpt_id, +IOMMU_HWPT_DATA_NONE ,0 ,0 ))return -1 ;if (_test_cmd_mock_domain_replace (self->fd, stdev_id, ioas_id2,NULL ))
tools/testing/selftests/iommu/iommufd_utils.h +24 -7
@@ -154,13 +154,17 @@ static int _test_cmd_mock_domain_replace(int fd, __u32 stdev_id, __u32 pt_id, pt_id, NULL))static int _test_cmd_hwpt_alloc (int fd,__u32 device_id,__u32 pt_id, -__u32 flags,__u32 *hwpt_id) +__u32 flags,__u32 *hwpt_id,__u32 data_type, +void *data,size_t data_len) {struct iommu_hwpt_alloc cmd = { .size =sizeof (cmd), .flags = flags, .dev_id = device_id, .pt_id = pt_id, + .data_type = data_type, + .data_len = data_len, + .data_uptr = (uint64_t )data, };int ret;
@@ -172,12 +176,25 @@ static int _test_cmd_hwpt_alloc(int fd, __u32 device_id, __u32 pt_id,return 0 ; } -#define test_cmd_hwpt_alloc (device_id, pt_id, flags, hwpt_id) \ - ASSERT_EQ(0, _test_cmd_hwpt_alloc(self->fd, device_id, \ - pt_id, flags, hwpt_id)) -#define test_err_hwpt_alloc (_errno, device_id, pt_id, flags, hwpt_id) \ - EXPECT_ERRNO(_errno, _test_cmd_hwpt_alloc(self->fd, device_id, \ - pt_id, flags, hwpt_id)) +#define test_cmd_hwpt_alloc (device_id, pt_id, flags, hwpt_id) \ + ASSERT_EQ(0, _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, flags, \ + hwpt_id, IOMMU_HWPT_DATA_NONE, \ + NULL, 0)) +#define test_err_hwpt_alloc (_errno, device_id, pt_id, flags, hwpt_id) \ + EXPECT_ERRNO(_errno, _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, \ + flags, hwpt_id, \ + IOMMU_HWPT_DATA_NONE, \ + NULL, 0)) + +#define test_cmd_hwpt_alloc_nested (device_id, pt_id, flags, hwpt_id, \ + data_type, data, data_len) \ + ASSERT_EQ(0, _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, flags, \ + hwpt_id, data_type, data, data_len)) +#define test_err_hwpt_alloc_nested (_errno, device_id, pt_id, flags, hwpt_id, \ + data_type, data, data_len) \ + EXPECT_ERRNO(_errno, \ + _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, flags, \ + hwpt_id, data_type, data, data_len))static int _test_cmd_access_replace_ioas (int fd,__u32 access_id,unsigned int ioas_id)
Signature · 1 line
2.34.1
Jason Gunthorpe
maintainerQuoted 15 lines · Yi Liu
Jason Gunthorpe (2):
iommufd: RenameIOMMUFD_OBJ_HW_PAGETABLEtoIOMMUFD_OBJ_HWPT_PAGINGiommufd/device: Wrap IOMMUFD_OBJ_HWPT_PAGING-only configurationsLu Baolu (1):
iommu: AddIOMMU_DOMAIN_NESTEDNicolin Chen (6):
iommufd: Deriveiommufd_hwpt_pagingfromiommufd_hw_pagetable
iommufd: Shareiommufd_hwpt_allocwithIOMMUFD_OBJ_HWPT_NESTED
iommufd: Add a nested HW pagetable object
iommu: Addiommu_copy_struct_from_userhelper iommufd/selftest: Add nested domain allocation for mock domain iommufd/selftest: Add coverage forIOMMU_HWPT_ALLOCwith nested HWPTs
Quoted 2 lines
Yi Liu (1):
iommu: Pass in parent domain withuser_datatodomain_alloc_userop
I made the changes noted in the thread and pushed this to linux-next
If we need more things then lets have a v6 no later than thursday, otherwise please check/retest what I pushed carefully.
Thanks,
Jason
Quoted 22 lines
From: Jason Gunthorpe <[email protected]>
Sent: Wednesday, October 25, 2023 1:56 AMQuoted 2 lines · Yi Liu
Jason Gunthorpe (2):
iommufd: RenameIOMMUFD_OBJ_HW_PAGETABLEto
IOMMUFD_OBJ_HWPT_PAGINGQuoted 1 line
iommufd/device: Wrap IOMMUFD_OBJ_HWPT_PAGING-only
configurations
Quoted 7 lines
Lu Baolu (1):
iommu: AddIOMMU_DOMAIN_NESTEDNicolin Chen (6):
iommufd: Deriveiommufd_hwpt_pagingfromiommufd_hw_pagetable
iommufd: Shareiommufd_hwpt_allocwith
IOMMUFD_OBJ_HWPT_NESTEDQuoted 4 lines
iommufd: Add a nested HW pagetable object
iommu: Addiommu_copy_struct_from_userhelper iommufd/selftest: Add nested domain allocation for mock domain iommufd/selftest: Add coverage forIOMMU_HWPT_ALLOCwith nested
Quoted 7 lines
HWPTs
Quoted 3 lines
Yi Liu (1):
iommu: Pass in parent domain withuser_datatodomain_alloc_useropI made the changes noted in the thread and pushed this to linux-next
this looks good overall except a small error. For the whole series with your changes: