| Message ID | 20230814011759.102089-3-baolu.lu@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iommu: Make pasid array per device | expand |
On Mon, Aug 14, 2023 at 09:17:58AM +0800, Lu Baolu wrote: > When switching device DMA ownership, it is required that all the device's > pasid DMA be disabled. This is done by checking if the pasid array of the > group is empty. Consolidate all the open code into a single helper. No > intentional functionality change. > > Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> > --- > drivers/iommu/iommu.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index f1eba60e573f..d4a06a37ce39 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -3127,6 +3127,19 @@ static bool iommu_is_default_domain(struct iommu_group *group) > return false; > } > > +/* > + * Assert no PASID DMA when claiming or releasing group's DMA ownership. ^ |... > + * The device pasid interfaces are only for device drivers that have > + * claimed the DMA ownership. Return true if no pasid DMA setup, otherwise > + * return false with a WARN(). > + */ > +static bool assert_pasid_dma_ownership(struct iommu_group *group) ... should it be assert_no_pasid_dma_ownership? Nic
On 2023/8/18 13:43, Nicolin Chen wrote: > On Mon, Aug 14, 2023 at 09:17:58AM +0800, Lu Baolu wrote: > >> When switching device DMA ownership, it is required that all the device's >> pasid DMA be disabled. This is done by checking if the pasid array of the >> group is empty. Consolidate all the open code into a single helper. No >> intentional functionality change. >> >> Signed-off-by: Lu Baolu<baolu.lu@linux.intel.com> >> --- >> drivers/iommu/iommu.c | 23 ++++++++++++++++++----- >> 1 file changed, 18 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c >> index f1eba60e573f..d4a06a37ce39 100644 >> --- a/drivers/iommu/iommu.c >> +++ b/drivers/iommu/iommu.c >> @@ -3127,6 +3127,19 @@ static bool iommu_is_default_domain(struct iommu_group *group) >> return false; >> } >> >> +/* >> + * Assert no PASID DMA when claiming or releasing group's DMA ownership. > ^ > |... > >> + * The device pasid interfaces are only for device drivers that have >> + * claimed the DMA ownership. Return true if no pasid DMA setup, otherwise >> + * return false with a WARN(). >> + */ >> +static bool assert_pasid_dma_ownership(struct iommu_group *group) > ... should it be assert_no_pasid_dma_ownership? Fair enough. Or, perhaps just assert_no_pasid_dma()? Best regards, baolu
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f1eba60e573f..d4a06a37ce39 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -3127,6 +3127,19 @@ static bool iommu_is_default_domain(struct iommu_group *group) return false; } +/* + * Assert no PASID DMA when claiming or releasing group's DMA ownership. + * The device pasid interfaces are only for device drivers that have + * claimed the DMA ownership. Return true if no pasid DMA setup, otherwise + * return false with a WARN(). + */ +static bool assert_pasid_dma_ownership(struct iommu_group *group) +{ + lockdep_assert_held(&group->mutex); + + return !WARN_ON(!xa_empty(&group->pasid_array)); +} + /** * iommu_device_use_default_domain() - Device driver wants to handle device * DMA through the kernel DMA API. @@ -3147,7 +3160,7 @@ int iommu_device_use_default_domain(struct device *dev) mutex_lock(&group->mutex); if (group->owner_cnt) { if (group->owner || !iommu_is_default_domain(group) || - !xa_empty(&group->pasid_array)) { + !assert_pasid_dma_ownership(group)) { ret = -EBUSY; goto unlock_out; } @@ -3177,7 +3190,7 @@ void iommu_device_unuse_default_domain(struct device *dev) return; mutex_lock(&group->mutex); - if (!WARN_ON(!group->owner_cnt || !xa_empty(&group->pasid_array))) + if (!WARN_ON(!group->owner_cnt) && assert_pasid_dma_ownership(group)) group->owner_cnt--; mutex_unlock(&group->mutex); @@ -3211,7 +3224,7 @@ static int __iommu_take_dma_ownership(struct iommu_group *group, void *owner) int ret; if ((group->domain && group->domain != group->default_domain) || - !xa_empty(&group->pasid_array)) + !assert_pasid_dma_ownership(group)) return -EBUSY; ret = __iommu_group_alloc_blocking_domain(group); @@ -3296,8 +3309,8 @@ EXPORT_SYMBOL_GPL(iommu_device_claim_dma_owner); static void __iommu_release_dma_ownership(struct iommu_group *group) { - if (WARN_ON(!group->owner_cnt || !group->owner || - !xa_empty(&group->pasid_array))) + if (WARN_ON(!group->owner_cnt || !group->owner) || + !assert_pasid_dma_ownership(group)) return; group->owner_cnt = 0;
When switching device DMA ownership, it is required that all the device's pasid DMA be disabled. This is done by checking if the pasid array of the group is empty. Consolidate all the open code into a single helper. No intentional functionality change. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- drivers/iommu/iommu.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)