Re: [PATCH v2 2/9] iommu/ioasid: Rename ioasid_set_data()
Hi jacob, On 8/22/20 6:35 AM, Jacob Pan wrote: > Rename ioasid_set_data() to ioasid_attach_data() to avoid confusion with > struct ioasid_set. ioasid_set is a group of IOASIDs that share a common > token. > > Signed-off-by: Jacob Pan Reviewed-by: Eric Auger Eric > --- > drivers/iommu/intel/svm.c | 6 +++--- > drivers/iommu/ioasid.c| 6 +++--- > include/linux/ioasid.h| 4 ++-- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c > index b6972dca2ae0..37a9beabc0ca 100644 > --- a/drivers/iommu/intel/svm.c > +++ b/drivers/iommu/intel/svm.c > @@ -342,7 +342,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, > struct device *dev, > svm->gpasid = data->gpasid; > svm->flags |= SVM_FLAG_GUEST_PASID; > } > - ioasid_set_data(data->hpasid, svm); > + ioasid_attach_data(data->hpasid, svm); > INIT_LIST_HEAD_RCU(&svm->devs); > mmput(svm->mm); > } > @@ -394,7 +394,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, > struct device *dev, > list_add_rcu(&sdev->list, &svm->devs); > out: > if (!IS_ERR_OR_NULL(svm) && list_empty(&svm->devs)) { > - ioasid_set_data(data->hpasid, NULL); > + ioasid_attach_data(data->hpasid, NULL); > kfree(svm); > } > > @@ -437,7 +437,7 @@ int intel_svm_unbind_gpasid(struct device *dev, int pasid) >* the unbind, IOMMU driver will get notified >* and perform cleanup. >*/ > - ioasid_set_data(pasid, NULL); > + ioasid_attach_data(pasid, NULL); > kfree(svm); > } > } > diff --git a/drivers/iommu/ioasid.c b/drivers/iommu/ioasid.c > index 0f8dd377aada..5f63af07acd5 100644 > --- a/drivers/iommu/ioasid.c > +++ b/drivers/iommu/ioasid.c > @@ -258,14 +258,14 @@ void ioasid_unregister_allocator(struct > ioasid_allocator_ops *ops) > EXPORT_SYMBOL_GPL(ioasid_unregister_allocator); > > /** > - * ioasid_set_data - Set private data for an allocated ioasid > + * ioasid_attach_data - Set private data for an allocated ioasid > * @ioasid: the ID to set data > * @data: the private data > * > * For IOASID that is already allocated, private data can be set > * via this API. Future lookup can be done via ioasid_find. > */ > -int ioasid_set_data(ioasid_t ioasid, void *data) > +int ioasid_attach_data(ioasid_t ioasid, void *data) > { > struct ioasid_data *ioasid_data; > int ret = 0; > @@ -287,7 +287,7 @@ int ioasid_set_data(ioasid_t ioasid, void *data) > > return ret; > } > -EXPORT_SYMBOL_GPL(ioasid_set_data); > +EXPORT_SYMBOL_GPL(ioasid_attach_data); > > /** > * ioasid_alloc - Allocate an IOASID > diff --git a/include/linux/ioasid.h b/include/linux/ioasid.h > index 6f000d7a0ddc..9c44947a68c8 100644 > --- a/include/linux/ioasid.h > +++ b/include/linux/ioasid.h > @@ -39,7 +39,7 @@ void *ioasid_find(struct ioasid_set *set, ioasid_t ioasid, > bool (*getter)(void *)); > int ioasid_register_allocator(struct ioasid_allocator_ops *allocator); > void ioasid_unregister_allocator(struct ioasid_allocator_ops *allocator); > -int ioasid_set_data(ioasid_t ioasid, void *data); > +int ioasid_attach_data(ioasid_t ioasid, void *data); > > #else /* !CONFIG_IOASID */ > static inline ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, > @@ -67,7 +67,7 @@ static inline void ioasid_unregister_allocator(struct > ioasid_allocator_ops *allo > { > } > > -static inline int ioasid_set_data(ioasid_t ioasid, void *data) > +static inline int ioasid_attach_data(ioasid_t ioasid, void *data) > { > return -ENOTSUPP; > } > ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 2/9] iommu/ioasid: Rename ioasid_set_data()
On Fri, Aug 21, 2020 at 09:35:11PM -0700, Jacob Pan wrote: > Rename ioasid_set_data() to ioasid_attach_data() to avoid confusion with > struct ioasid_set. ioasid_set is a group of IOASIDs that share a common > token. > > Signed-off-by: Jacob Pan Reviewed-by: Jean-Philippe Brucker > --- > drivers/iommu/intel/svm.c | 6 +++--- > drivers/iommu/ioasid.c| 6 +++--- > include/linux/ioasid.h| 4 ++-- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c > index b6972dca2ae0..37a9beabc0ca 100644 > --- a/drivers/iommu/intel/svm.c > +++ b/drivers/iommu/intel/svm.c > @@ -342,7 +342,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, > struct device *dev, > svm->gpasid = data->gpasid; > svm->flags |= SVM_FLAG_GUEST_PASID; > } > - ioasid_set_data(data->hpasid, svm); > + ioasid_attach_data(data->hpasid, svm); > INIT_LIST_HEAD_RCU(&svm->devs); > mmput(svm->mm); > } > @@ -394,7 +394,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, > struct device *dev, > list_add_rcu(&sdev->list, &svm->devs); > out: > if (!IS_ERR_OR_NULL(svm) && list_empty(&svm->devs)) { > - ioasid_set_data(data->hpasid, NULL); > + ioasid_attach_data(data->hpasid, NULL); > kfree(svm); > } > > @@ -437,7 +437,7 @@ int intel_svm_unbind_gpasid(struct device *dev, int pasid) >* the unbind, IOMMU driver will get notified >* and perform cleanup. >*/ > - ioasid_set_data(pasid, NULL); > + ioasid_attach_data(pasid, NULL); > kfree(svm); > } > } > diff --git a/drivers/iommu/ioasid.c b/drivers/iommu/ioasid.c > index 0f8dd377aada..5f63af07acd5 100644 > --- a/drivers/iommu/ioasid.c > +++ b/drivers/iommu/ioasid.c > @@ -258,14 +258,14 @@ void ioasid_unregister_allocator(struct > ioasid_allocator_ops *ops) > EXPORT_SYMBOL_GPL(ioasid_unregister_allocator); > > /** > - * ioasid_set_data - Set private data for an allocated ioasid > + * ioasid_attach_data - Set private data for an allocated ioasid > * @ioasid: the ID to set data > * @data: the private data > * > * For IOASID that is already allocated, private data can be set > * via this API. Future lookup can be done via ioasid_find. > */ > -int ioasid_set_data(ioasid_t ioasid, void *data) > +int ioasid_attach_data(ioasid_t ioasid, void *data) > { > struct ioasid_data *ioasid_data; > int ret = 0; > @@ -287,7 +287,7 @@ int ioasid_set_data(ioasid_t ioasid, void *data) > > return ret; > } > -EXPORT_SYMBOL_GPL(ioasid_set_data); > +EXPORT_SYMBOL_GPL(ioasid_attach_data); > > /** > * ioasid_alloc - Allocate an IOASID > diff --git a/include/linux/ioasid.h b/include/linux/ioasid.h > index 6f000d7a0ddc..9c44947a68c8 100644 > --- a/include/linux/ioasid.h > +++ b/include/linux/ioasid.h > @@ -39,7 +39,7 @@ void *ioasid_find(struct ioasid_set *set, ioasid_t ioasid, > bool (*getter)(void *)); > int ioasid_register_allocator(struct ioasid_allocator_ops *allocator); > void ioasid_unregister_allocator(struct ioasid_allocator_ops *allocator); > -int ioasid_set_data(ioasid_t ioasid, void *data); > +int ioasid_attach_data(ioasid_t ioasid, void *data); > > #else /* !CONFIG_IOASID */ > static inline ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, > @@ -67,7 +67,7 @@ static inline void ioasid_unregister_allocator(struct > ioasid_allocator_ops *allo > { > } > > -static inline int ioasid_set_data(ioasid_t ioasid, void *data) > +static inline int ioasid_attach_data(ioasid_t ioasid, void *data) > { > return -ENOTSUPP; > } > -- > 2.7.4 > ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
[PATCH v2 2/9] iommu/ioasid: Rename ioasid_set_data()
Rename ioasid_set_data() to ioasid_attach_data() to avoid confusion with struct ioasid_set. ioasid_set is a group of IOASIDs that share a common token. Signed-off-by: Jacob Pan --- drivers/iommu/intel/svm.c | 6 +++--- drivers/iommu/ioasid.c| 6 +++--- include/linux/ioasid.h| 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index b6972dca2ae0..37a9beabc0ca 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -342,7 +342,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev, svm->gpasid = data->gpasid; svm->flags |= SVM_FLAG_GUEST_PASID; } - ioasid_set_data(data->hpasid, svm); + ioasid_attach_data(data->hpasid, svm); INIT_LIST_HEAD_RCU(&svm->devs); mmput(svm->mm); } @@ -394,7 +394,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev, list_add_rcu(&sdev->list, &svm->devs); out: if (!IS_ERR_OR_NULL(svm) && list_empty(&svm->devs)) { - ioasid_set_data(data->hpasid, NULL); + ioasid_attach_data(data->hpasid, NULL); kfree(svm); } @@ -437,7 +437,7 @@ int intel_svm_unbind_gpasid(struct device *dev, int pasid) * the unbind, IOMMU driver will get notified * and perform cleanup. */ - ioasid_set_data(pasid, NULL); + ioasid_attach_data(pasid, NULL); kfree(svm); } } diff --git a/drivers/iommu/ioasid.c b/drivers/iommu/ioasid.c index 0f8dd377aada..5f63af07acd5 100644 --- a/drivers/iommu/ioasid.c +++ b/drivers/iommu/ioasid.c @@ -258,14 +258,14 @@ void ioasid_unregister_allocator(struct ioasid_allocator_ops *ops) EXPORT_SYMBOL_GPL(ioasid_unregister_allocator); /** - * ioasid_set_data - Set private data for an allocated ioasid + * ioasid_attach_data - Set private data for an allocated ioasid * @ioasid: the ID to set data * @data: the private data * * For IOASID that is already allocated, private data can be set * via this API. Future lookup can be done via ioasid_find. */ -int ioasid_set_data(ioasid_t ioasid, void *data) +int ioasid_attach_data(ioasid_t ioasid, void *data) { struct ioasid_data *ioasid_data; int ret = 0; @@ -287,7 +287,7 @@ int ioasid_set_data(ioasid_t ioasid, void *data) return ret; } -EXPORT_SYMBOL_GPL(ioasid_set_data); +EXPORT_SYMBOL_GPL(ioasid_attach_data); /** * ioasid_alloc - Allocate an IOASID diff --git a/include/linux/ioasid.h b/include/linux/ioasid.h index 6f000d7a0ddc..9c44947a68c8 100644 --- a/include/linux/ioasid.h +++ b/include/linux/ioasid.h @@ -39,7 +39,7 @@ void *ioasid_find(struct ioasid_set *set, ioasid_t ioasid, bool (*getter)(void *)); int ioasid_register_allocator(struct ioasid_allocator_ops *allocator); void ioasid_unregister_allocator(struct ioasid_allocator_ops *allocator); -int ioasid_set_data(ioasid_t ioasid, void *data); +int ioasid_attach_data(ioasid_t ioasid, void *data); #else /* !CONFIG_IOASID */ static inline ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, @@ -67,7 +67,7 @@ static inline void ioasid_unregister_allocator(struct ioasid_allocator_ops *allo { } -static inline int ioasid_set_data(ioasid_t ioasid, void *data) +static inline int ioasid_attach_data(ioasid_t ioasid, void *data) { return -ENOTSUPP; } -- 2.7.4 ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu