iommu: correct group reference count
RFC v2 1/1 iommu: correct group reference count
The basic flow for iommu_group_for_dev is:iommu_group_get_for_dev
|-> iommu_group_get : increase reference count by 1.
return group;
|-> ops->device_group : Init/increase reference count to/by 1.
iommu_group_add_device : Increase reference count by 1.
return group;We can see that ops->device_group and iommu_group_add_device will together increase the iommu group reference count by 2. Actually we only need 1, but not 2. So we need add iommu_group_put after iommu_group_add_device to make sure iommu_group_get_for_dev only increase reference count by 1.
---
V1 thread: https://lkml.org/lkml/2015/11/3/304
Changes V2:
I did not see the update about device_group when I worked out V1. So redo the patch and refine commit msg and rebased to latest linus' linux master tree.
drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/iommu.c +3 -3
@@ -852,10 +852,10 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) } ret =iommu_group_add_device (group, dev); -if (ret) { -iommu_group_put (group); +iommu_group_put (group); + +if (ret)return ERR_PTR (ret); - }return group; }
Signature · 1 line
1.8.4
Quoted 32 lines · Peng Fan
The basic flow for
iommu_group_for_devis:iommu_group_get_for_dev|-> iommu_group_get : increase reference count by 1. return group; |-> ops->device_group : Init/increase reference count to/by 1. iommu_group_add_device : Increase reference count by 1. return group;We can see that
ops->device_groupandiommu_group_add_devicewill together increase the iommu group reference count by 2. Actually we only need 1, but not 2. So we need addiommu_group_putafteriommu_group_add_deviceto make sureiommu_group_get_for_devonly increase reference count by 1.Signed-off-by Peng Fan <[email protected]>Cc Joerg Roedel <[email protected]>Cc Will Deacon <[email protected]>---
V1 thread: https://lkml.org/lkml/2015/11/3/304
Changes V2:
I did not see the update aboutdevice_groupwhen I worked out V1. So redo the patch and refine commit msg and rebased to latest linus' linux master tree.drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/iommu/iommu.c +0
-0
drivers/iommu/iommu.c struct iommu_group *iommu_group_get_for_dev(struct device *dev) · line 858
Quoted 10 lines
drivers/iommu/iommu.c +3
-3@@ -852,10 +852,10 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) } ret =iommu_group_add_device (group, dev); -if (ret) { -iommu_group_put (group); +iommu_group_put (group); + +if (ret)return ERR_PTR (ret); - }
Hmm, I don't think this is correct either:
(1) It doesn't help the arm-smmu driver (which deals with platform devices too)
(2) It breaks IOMMU drivers that currently have the explicit put already
(e.g. amd-iommu.c:init_iommu_group)
The easiest way for you to proceed is to extend your original patch so that it also adds an iommu_group_put to the arm-smmu-v3 driver after a successful iommu_group_get_for_dev.
Will
Hi Will,
Quoted 49 lines · Will Deacon
Quoted 32 lines · Peng Fan
The basic flow for
iommu_group_for_devis:iommu_group_get_for_dev|-> iommu_group_get : increase reference count by 1. return group; |-> ops->device_group : Init/increase reference count to/by 1. iommu_group_add_device : Increase reference count by 1. return group;We can see that
ops->device_groupandiommu_group_add_devicewill together increase the iommu group reference count by 2. Actually we only need 1, but not 2. So we need addiommu_group_putafteriommu_group_add_deviceto make sureiommu_group_get_for_devonly increase reference count by 1.Signed-off-by Peng Fan <[email protected]>Cc Joerg Roedel <[email protected]>Cc Will Deacon <[email protected]>---
V1 thread: https://lkml.org/lkml/2015/11/3/304
Changes V2:
I did not see the update aboutdevice_groupwhen I worked out V1. So redo the patch and refine commit msg and rebased to latest linus' linux master tree.drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/iommu/iommu.c +0
-0drivers/iommu/iommu.c struct iommu_group *iommu_group_get_for_dev(struct device *dev) · line 858
Quoted 10 lines
drivers/iommu/iommu.c +3
-3@@ -852,10 +852,10 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) } ret =iommu_group_add_device (group, dev); -if (ret) { -iommu_group_put (group); +iommu_group_put (group); + +if (ret)return ERR_PTR (ret); - }Hmm, I don't think this is correct either:
(1) It doesn't help the arm-smmu driver (which deals with platform devices too)
Quoted 6 lines
(2) It breaks IOMMU drivers that currently have the explicit put already
(e.g. amd-iommu.c:init_iommu_group)The easiest way for you to proceed is to extend your original patch so that it also adds an
iommu_group_putto the arm-smmu-v3 driver after a successfuliommu_group_get_for_dev.
I am not sure if the following patch is what you preferred. But this means that iommu_grou_get_for_dev will increase the group reference count by 2, when need to create a new group?
drivers/iommu/arm-smmu-v3.c +3 -0
@@ -1855,6 +1855,9 @@ static int arm_smmu_add_device(struct device *dev)/* Add the new SID */ sids[smmu_group->num_sids -1 ] = sid; smmu_group->sids = sids; + +iommu_group_put (group); +return 0 ; out_put_group:
drivers/iommu/arm-smmu.c +2 -0
@@ -1357,6 +1357,8 @@ static int arm_smmu_add_device(struct device *dev)if (IS_ERR (group))return PTR_ERR (group); +iommu_group_put (group); +return 0 ; }
Thanks,
Peng.
Quoted 2 lines
Will
Quoted 8 lines · Peng Fan
The basic flow for
iommu_group_for_devis:iommu_group_get_for_dev|-> iommu_group_get : increase reference count by 1. return group; |-> ops->device_group : Init/increase reference count to/by 1. iommu_group_add_device : Increase reference count by 1. return group;
Quoted 4 lines
We can see that
ops->device_groupandiommu_group_add_devicewill together increase the iommu group reference count by 2. Actually we only need 1, but not 2. So we need addiommu_group_putafteriommu_group_add_deviceto make sureiommu_group_get_for_devonly increase reference count by 1.
The premise seems incorrect to me. In the first case where iommu_group_get() provides a group, the reference is increased by 1, but the device is already a member of the group and therefore already increases the reference count of the group by 1. The minimum group reference at that point is therefore 2. In the second case, the group is created, which gives us our first reference, and the device is added, giving us our second reference. Therefore the minimum reference count is also 2. If we decrement it, allowing the caller to get the group with a single reference and they release that reference, the group will be destroyed even though it has a device member. One reference to the group is for the caller, the other reference is for the device contained in the group. Thanks,
Alex
Quoted 32 lines
Signed-off-by Peng Fan <[email protected]>Cc Joerg Roedel <[email protected]>Cc Will Deacon <[email protected]>---
V1 thread: https://lkml.org/lkml/2015/11/3/304
Changes V2:
I did not see the update aboutdevice_groupwhen I worked out V1. So redo the patch and refine commit msg and rebased to latest linus' linux master tree.drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/iommu/iommu.c +3
-3@@ -852,10 +852,10 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) } ret =iommu_group_add_device (group, dev); -if (ret) { -iommu_group_put (group); +iommu_group_put (group); + +if (ret)return ERR_PTR (ret); - }return group; }
Hi Alex,
Quoted 9 lines · Alex Williamson
Quoted 8 lines · Peng Fan
The basic flow for
iommu_group_for_devis:iommu_group_get_for_dev|-> iommu_group_get : increase reference count by 1. return group; |-> ops->device_group : Init/increase reference count to/by 1. iommu_group_add_device : Increase reference count by 1. return group;
Quoted 5 lines
Quoted 4 lines
We can see that
ops->device_groupandiommu_group_add_devicewill together increase the iommu group reference count by 2. Actually we only need 1, but not 2. So we need addiommu_group_putafteriommu_group_add_deviceto make sureiommu_group_get_for_devonly increase reference count by 1.
Thanks for comments.
Quoted 5 lines
The premise seems incorrect to me. In the first case where
iommu_group_get()provides a group, the reference is increased by 1, but the device is already a member of the group and therefore already increases the reference count of the group by 1. The minimum group reference at that point is therefore 2.
Yeah. The minimum group reference at that point is 2.
Quoted 4 lines
In the second case, the group
is created, which gives us our first reference, and the device is added, giving us our second reference. Therefore the minimum reference count is also 2.
Yeah.
Quoted 3 lines
If we decrement it, allowing the caller to get the group with a single reference and they release that reference, the group will be destroyed even though it has a device member.
Thanks. Then Caller of iommu_group_get_for_dev should decrease the count by 1.
Thanks,
Peng.
Quoted 41 lines
One reference to the
group is for the caller, the other reference is for the device contained in the group. Thanks,Alex
Quoted 32 lines
Signed-off-by Peng Fan <[email protected]>Cc Joerg Roedel <[email protected]>Cc Will Deacon <[email protected]>---
V1 thread: https://lkml.org/lkml/2015/11/3/304
Changes V2:
I did not see the update aboutdevice_groupwhen I worked out V1. So redo the patch and refine commit msg and rebased to latest linus' linux master tree.drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/iommu/iommu.c +3
-3@@ -852,10 +852,10 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) } ret =iommu_group_add_device (group, dev); -if (ret) { -iommu_group_put (group); +iommu_group_put (group); + +if (ret)return ERR_PTR (ret); - }return group; }