| Message ID | 20241007130941.62709-1-anumula@chelsio.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [for-rc,v2] RDMA/core: Fix ENODEV error for iWARP test over vlan | expand |
On Mon, Oct 07, 2024 at 06:39:41PM +0530, Anumula Murali Mohan Reddy wrote: > If traffic is over vlan, cma_validate_port() fails to match vlan > net_device ifindex with bound_if_index and results in ENODEV error. > It is because rdma_copy_src_l2_addr() always assigns bound_if_index with > real net_device ifindex. > This patch fixes the issue by assigning bound_if_index with vlan > net_device index if traffic is over vlan. > > Fixes: f8ef1be816bf ("RDMA/cma: Avoid GID lookups on iWARP devices") > Signed-off-by: Anumula Murali Mohan Reddy <anumula@chelsio.com> > Signed-off-by: Potnuri Bharat Teja <bharat@chelsio.com> > --- > Changes since v1: > Added fixes line > Addressed static checker warnings > Targeting to rc since this is a bug fix > --- > drivers/infiniband/core/addr.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c > index be0743dac3ff..8962fc0fe4c4 100644 > --- a/drivers/infiniband/core/addr.c > +++ b/drivers/infiniband/core/addr.c > @@ -269,6 +269,8 @@ rdma_find_ndev_for_src_ip_rcu(struct net *net, const struct sockaddr *src_in) > break; > #endif > } > + if (dev && is_vlan_dev(dev)) You should take "ret" into consideration here, and probably the right way is to check is "if (!ret && dev && is_vlan_dev(dev))". The "&& dev &&" is not really needed, but it is a good thing to have it for static checkers. Thanks > + dev = vlan_dev_real_dev(dev); > return ret ? ERR_PTR(ret) : dev; > } > > -- > 2.39.3 > >
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index be0743dac3ff..8962fc0fe4c4 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -269,6 +269,8 @@ rdma_find_ndev_for_src_ip_rcu(struct net *net, const struct sockaddr *src_in) break; #endif } + if (dev && is_vlan_dev(dev)) + dev = vlan_dev_real_dev(dev); return ret ? ERR_PTR(ret) : dev; }
If traffic is over vlan, cma_validate_port() fails to match vlan net_device ifindex with bound_if_index and results in ENODEV error. It is because rdma_copy_src_l2_addr() always assigns bound_if_index with real net_device ifindex. This patch fixes the issue by assigning bound_if_index with vlan net_device index if traffic is over vlan. Fixes: f8ef1be816bf ("RDMA/cma: Avoid GID lookups on iWARP devices") Signed-off-by: Anumula Murali Mohan Reddy <anumula@chelsio.com> Signed-off-by: Potnuri Bharat Teja <bharat@chelsio.com> --- Changes since v1: Added fixes line Addressed static checker warnings Targeting to rc since this is a bug fix --- drivers/infiniband/core/addr.c | 2 ++ 1 file changed, 2 insertions(+)