Skip to content

Commit 3006b15

Browse files
jgunthorpejoergroedel
authored andcommitted
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 <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Tested-by: Heiko Stuebner <[email protected]> Tested-by: Niklas Schnelle <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent 4db0e5f commit 3006b15

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.clang-format

+1
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ ForEachMacros:
254254
- 'for_each_free_mem_range'
255255
- 'for_each_free_mem_range_reverse'
256256
- 'for_each_func_rsrc'
257+
- 'for_each_group_device'
257258
- 'for_each_group_evsel'
258259
- 'for_each_group_member'
259260
- 'for_each_hstate'

drivers/iommu/iommu.c

+10-6
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ struct group_device {
6868
char *name;
6969
};
7070

71+
/* Iterate over each struct group_device in a struct iommu_group */
72+
#define for_each_group_device(group, pos) \
73+
list_for_each_entry(pos, &(group)->devices, list)
74+
7175
struct iommu_group_attribute {
7276
struct attribute attr;
7377
ssize_t (*show)(struct iommu_group *group, char *buf);
@@ -468,7 +472,7 @@ __iommu_group_remove_device(struct iommu_group *group, struct device *dev)
468472
struct group_device *device;
469473

470474
lockdep_assert_held(&group->mutex);
471-
list_for_each_entry(device, &group->devices, list) {
475+
for_each_group_device(group, device) {
472476
if (device->dev == dev) {
473477
list_del(&device->list);
474478
return device;
@@ -707,7 +711,7 @@ int iommu_get_group_resv_regions(struct iommu_group *group,
707711
int ret = 0;
708712

709713
mutex_lock(&group->mutex);
710-
list_for_each_entry(device, &group->devices, list) {
714+
for_each_group_device(group, device) {
711715
struct list_head dev_resv_regions;
712716

713717
/*
@@ -1131,7 +1135,7 @@ static int __iommu_group_for_each_dev(struct iommu_group *group, void *data,
11311135
struct group_device *device;
11321136
int ret = 0;
11331137

1134-
list_for_each_entry(device, &group->devices, list) {
1138+
for_each_group_device(group, device) {
11351139
ret = fn(device->dev, data);
11361140
if (ret)
11371141
break;
@@ -1935,7 +1939,7 @@ bool iommu_group_has_isolated_msi(struct iommu_group *group)
19351939
bool ret = true;
19361940

19371941
mutex_lock(&group->mutex);
1938-
list_for_each_entry(group_dev, &group->devices, list)
1942+
for_each_group_device(group, group_dev)
19391943
ret &= msi_device_has_isolated_msi(group_dev->dev);
19401944
mutex_unlock(&group->mutex);
19411945
return ret;
@@ -3243,7 +3247,7 @@ static int __iommu_set_group_pasid(struct iommu_domain *domain,
32433247
struct group_device *device;
32443248
int ret = 0;
32453249

3246-
list_for_each_entry(device, &group->devices, list) {
3250+
for_each_group_device(group, device) {
32473251
ret = domain->ops->set_dev_pasid(domain, device->dev, pasid);
32483252
if (ret)
32493253
break;
@@ -3258,7 +3262,7 @@ static void __iommu_remove_group_pasid(struct iommu_group *group,
32583262
struct group_device *device;
32593263
const struct iommu_ops *ops;
32603264

3261-
list_for_each_entry(device, &group->devices, list) {
3265+
for_each_group_device(group, device) {
32623266
ops = dev_iommu_ops(device->dev);
32633267
ops->remove_dev_pasid(device->dev, pasid);
32643268
}

0 commit comments

Comments
 (0)