qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iommu: Add for_each_group_device() 

JIRA: https://issues.redhat.com/browse/RHEL-10094
Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Conflicts: Context diff in clang-format

commit 3006b15b364a34a2a19b45bb2948dd6a83c5e1fe
Author: Jason Gunthorpe <jgg@ziepe.ca>
Date:   Thu May 11 01:42:00 2023 -0300

    iommu: Add for_each_group_device()

    Convenience macro to iterate over every struct group_device in the group.

    Replace all open coded list_for_each_entry's with this macro.

    Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
    Reviewed-by: Kevin Tian <kevin.tian@intel.com>
    Tested-by: Heiko Stuebner <heiko@sntech.de>
    Tested-by: Niklas Schnelle <schnelle@linux.ibm.com>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Link: https://lore.kernel.org/r/2-v5-1b99ae392328+44574-iommu_err_unwind_jgg@nvidia.com
    Signed-off-by: Joerg Roedel <jroedel@suse.de>

(cherry picked from commit 3006b15b364a34a2a19b45bb2948dd6a83c5e1fe)
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
This commit is contained in:
Jerry Snitselaar 2023-05-11 01:42:00 -03:00
parent 81ab9f29aa
commit f66deef99c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-format
View File

@ -194,6 +194,7 @@ ForEachMacros:
- 'for_each_free_mem_range'
- 'for_each_free_mem_range_reverse'
- 'for_each_func_rsrc'
- 'for_each_group_device'
- 'for_each_hstate'
- 'for_each_if'
- 'for_each_iommu'

16
drivers/iommu/iommu.c
View File

@ -68,6 +68,10 @@ struct group_device {
char *name;
};
/* Iterate over each struct group_device in a struct iommu_group */
#define for_each_group_device(group, pos) \
list_for_each_entry(pos, &(group)->devices, list)
struct iommu_group_attribute {
struct attribute attr;
ssize_t (*show)(struct iommu_group *group, char *buf);
@ -468,7 +472,7 @@ __iommu_group_remove_device(struct iommu_group *group, struct device *dev)
struct group_device *device;
lockdep_assert_held(&group->mutex);
list_for_each_entry(device, &group->devices, list) {
for_each_group_device(group, device) {
if (device->dev == dev) {
list_del(&device->list);
return device;
@ -707,7 +711,7 @@ int iommu_get_group_resv_regions(struct iommu_group *group,
int ret = 0;
mutex_lock(&group->mutex);
list_for_each_entry(device, &group->devices, list) {
for_each_group_device(group, device) {
struct list_head dev_resv_regions;
/*
@ -1131,7 +1135,7 @@ static int __iommu_group_for_each_dev(struct iommu_group *group, void *data,
struct group_device *device;
int ret = 0;
list_for_each_entry(device, &group->devices, list) {
for_each_group_device(group, device) {
ret = fn(device->dev, data);
if (ret)
break;
@ -1935,7 +1939,7 @@ bool iommu_group_has_isolated_msi(struct iommu_group *group)
bool ret = true;
mutex_lock(&group->mutex);
list_for_each_entry(group_dev, &group->devices, list)
for_each_group_device(group, group_dev)
ret &= msi_device_has_isolated_msi(group_dev->dev);
mutex_unlock(&group->mutex);
return ret;
@ -3264,7 +3268,7 @@ static int __iommu_set_group_pasid(struct iommu_domain *domain,
struct group_device *device;
int ret = 0;
list_for_each_entry(device, &group->devices, list) {
for_each_group_device(group, device) {
ret = domain->ops->set_dev_pasid(domain, device->dev, pasid);
if (ret)
break;
@ -3279,7 +3283,7 @@ static void __iommu_remove_group_pasid(struct iommu_group *group,
struct group_device *device;
const struct iommu_ops *ops;
list_for_each_entry(device, &group->devices, list) {
for_each_group_device(group, device) {
ops = dev_iommu_ops(device->dev);
ops->remove_dev_pasid(device->dev, pasid);
}