| Message ID | 20180917140707.1253738-1-Haakon.Bugge@oracle.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | RDMA/i40iw: Fix incorrect iterator type | expand |
On Mon, Sep 17, 2018 at 04:07:07PM +0200, Håkon Bugge wrote: > Commit f27b4746f378 ("i40iw: add connection management code") uses an > incorrect rcu iterator, whilst holding the rtnl_lock. Since the > critical region invokes i40iw_manage_qhash(), which is a sleeping > function, the rcu locking and traversal cannot be used. > > Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com> > --- > drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to for-next, thanks Jason
>Subject: [PATCH] RDMA/i40iw: Fix incorrect iterator type > >Commit f27b4746f378 ("i40iw: add connection management code") uses an >incorrect rcu iterator, whilst holding the rtnl_lock. Since the critical region invokes >i40iw_manage_qhash(), which is a sleeping function, the rcu locking and >traversal cannot be used. > >Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com> >--- > drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks doing this Hakon! Acked-by: Shiraz Saleem <shiraz.saleem@intel.com>
diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c index 423818a7d333..771eb6bd0785 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_cm.c +++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c @@ -1689,7 +1689,7 @@ static enum i40iw_status_code i40iw_add_mqh_6(struct i40iw_device *iwdev, unsigned long flags; rtnl_lock(); - for_each_netdev_rcu(&init_net, ip_dev) { + for_each_netdev(&init_net, ip_dev) { if ((((rdma_vlan_dev_vlan_id(ip_dev) < I40IW_NO_VLAN) && (rdma_vlan_dev_real_dev(ip_dev) == iwdev->netdev)) || (ip_dev == iwdev->netdev)) && (ip_dev->flags & IFF_UP)) {
Commit f27b4746f378 ("i40iw: add connection management code") uses an incorrect rcu iterator, whilst holding the rtnl_lock. Since the critical region invokes i40iw_manage_qhash(), which is a sleeping function, the rcu locking and traversal cannot be used. Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com> --- drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)