RDMA: Fix netdev tracker in ib_device_set_netdev
PATCH v2 1/1 RDMA: Fix netdev tracker in ib_device_set_netdev
If a netdev has already been assigned, ib_device_set_netdev needs to release the reference on the older netdev but it is mistakenly being called for the new netdev. Fix it and in the process use netdev_put to be symmetrical with the netdev_hold.
---
v2
- remove __dev_put now that netdev_put is used
drivers/infiniband/core/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/core/device.c +1 -2
@@ -2167,14 +2167,13 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev, }if (old_ndev) -netdev_tracker_free (ndev, &pdata->netdev_tracker); +netdev_put (old_ndev, &pdata->netdev_tracker);if (ndev)netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC );rcu_assign_pointer (pdata->netdev, ndev);spin_unlock_irqrestore (&pdata->netdev_lock, flags);add_ndev_hash (pdata); -__dev_put (old_ndev);return 0 ; }
Signature · 1 line
2.39.3 (Apple Git-146)
Quoted 21 lines · David Ahern
If a netdev has already been assigned,
ib_device_set_netdevneeds to release the reference on the older netdev but it is mistakenly being called for the new netdev. Fix it and in the process usenetdev_putto be symmetrical with thenetdev_hold.Fixes 09f530f0c6d6 ("RDMA: Add netdevice_tracker to ib_device_set_netdev()")Signed-off-by David Ahern <[email protected]>---
v2
- remove__dev_putnow thatnetdev_putis useddrivers/infiniband/core/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/infiniband/core/device.c +0
-0@@ -2167,14 +2167,13 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev, }
drivers/infiniband/core/device.c int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev, · line 2177
Quoted 10 lines
drivers/infiniband/core/device.c +1
-2if (old_ndev) -netdev_tracker_free (ndev, &pdata->netdev_tracker); +netdev_put (old_ndev, &pdata->netdev_tracker);if (ndev)netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC );rcu_assign_pointer (pdata->netdev, ndev);spin_unlock_irqrestore (&pdata->netdev_lock, flags);add_ndev_hash (pdata); -__dev_put (old_ndev);
I applied with the following change:
drivers/infiniband/core/device.c +2 -4
@@ -2184,14 +2184,12 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev,return 0 ; } -if (old_ndev) -netdev_put (old_ndev, &pdata->netdev_tracker); -if (ndev) -netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC ); +netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC );rcu_assign_pointer (pdata->netdev, ndev);spin_unlock_irqrestore (&pdata->netdev_lock, flags);add_ndev_hash (pdata); +netdev_put (old_ndev, &pdata->netdev_tracker);return 0 ; }
Quoted 7 lines
drivers/infiniband/core/device.c +0
-1return 0 ; } --2.39.3 (Apple Git-146)
Quoted 45 lines · Leon Romanovsky
Quoted 21 lines · David Ahern
If a netdev has already been assigned,
ib_device_set_netdevneeds to release the reference on the older netdev but it is mistakenly being called for the new netdev. Fix it and in the process usenetdev_putto be symmetrical with thenetdev_hold.Fixes 09f530f0c6d6 ("RDMA: Add netdevice_tracker to ib_device_set_netdev()")Signed-off-by David Ahern <[email protected]>---
v2
- remove__dev_putnow thatnetdev_putis useddrivers/infiniband/core/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/infiniband/core/device.c +0
-0@@ -2167,14 +2167,13 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev, }drivers/infiniband/core/device.c int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev, · line 2177
Quoted 10 lines
drivers/infiniband/core/device.c +1
-2if (old_ndev) -netdev_tracker_free (ndev, &pdata->netdev_tracker); +netdev_put (old_ndev, &pdata->netdev_tracker);if (ndev)netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC );rcu_assign_pointer (pdata->netdev, ndev);spin_unlock_irqrestore (&pdata->netdev_lock, flags);add_ndev_hash (pdata); -__dev_put (old_ndev);I applied with the following change:
drivers/infiniband/core/device.c +0
-3@@ -2184,14 +2184,12 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev,return 0 ; } -if (old_ndev) -netdev_put (old_ndev, &pdata->netdev_tracker); -if (ndev)
drivers/infiniband/core/device.c int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev, · line 2195
Quoted 10 lines
drivers/infiniband/core/device.c +2
-1-netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC ); +netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC );rcu_assign_pointer (pdata->netdev, ndev);spin_unlock_irqrestore (&pdata->netdev_lock, flags);add_ndev_hash (pdata); +netdev_put (old_ndev, &pdata->netdev_tracker);return 0 ; }
The final version is:
drivers/infiniband/core/device.c +2 -5
@@ -2184,15 +2184,12 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev,return 0 ; } -if (old_ndev) -netdev_put (old_ndev, &pdata->netdev_tracker); -if (ndev) -netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC ); +netdev_put (old_ndev, &pdata->netdev_tracker); +netdev_hold (ndev, &pdata->netdev_tracker,GFP_ATOMIC );rcu_assign_pointer (pdata->netdev, ndev);spin_unlock_irqrestore (&pdata->netdev_lock, flags);add_ndev_hash (pdata); -return 0 ; }EXPORT_SYMBOL (ib_device_set_netdev);
Quoted 10 lines
Quoted 9 lines
drivers/infiniband/core/device.c +0
-1return 0 ; } --2.39.3 (Apple Git-146)
Leon Romanovsky
AppliedQuoted 6 lines · David Ahern
If a netdev has already been assigned,
ib_device_set_netdevneeds to release the reference on the older netdev but it is mistakenly being called for the new netdev. Fix it and in the process usenetdev_putto be symmetrical with thenetdev_hold.
Applied, thanks!
[1/1] RDMA: Fix netdev tracker in ib_device_set_netdev
https://git.kernel.org/rdma/rdma/c/bbff20fb3e6a00
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>