[PATCH rdma-rc] Revert "RDMA/core: Fix ENODEV error for iWARP test over vlan"

[PATCH rdma-rc] Revert "RDMA/core: Fix ENODEV error for iWARP test over vlan"

[Leon Romanovsky]

From: Leon Romanovsky <leonro@nvidia.com>

The citied commit in Fixes line caused to regression for udaddy [1]
application. It doesn't work over VLANs anymore.

Client:
  ifconfig eth2 1.1.1.1
  ip link add link eth2 name p0.3597 type vlan protocol 802.1Q id 3597
  ip link set dev p0.3597 up
  ip addr add 2.2.2.2/16 dev p0.3597
  udaddy -S 847 -C 220 -c 2 -t 0 -s 2.2.2.3 -b 2.2.2.2

Server:
  ifconfig eth2 1.1.1.3
  ip link add link eth2 name p0.3597 type vlan protocol 802.1Q id 3597
  ip link set dev p0.3597 up
  ip addr add 2.2.2.3/16 dev p0.3597
  udaddy -S 847 -C 220 -c 2 -t 0 -b 2.2.2.3

[1] https://github.com/linux-rdma/rdma-core/blob/master/librdmacm/examples/udaddy.c
Fixes: 5069d7e202f6 ("RDMA/core: Fix ENODEV error for iWARP test over vlan")
Reported-by: Leon Romanovsky <leonro@nvidia.com>
Closes: https://lore.kernel.org/all/20241110130746.GA48891@unreal
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
---
 drivers/infiniband/core/addr.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index c4cf26f1d149..be0743dac3ff 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -269,8 +269,6 @@ rdma_find_ndev_for_src_ip_rcu(struct net *net, const struct sockaddr *src_in)
 		break;
 #endif
 	}
-	if (!ret && dev && is_vlan_dev(dev))
-		dev = vlan_dev_real_dev(dev);
 	return ret ? ERR_PTR(ret) : dev;
 }
 
-- 
2.47.0

Re: [PATCH rdma-rc] Revert "RDMA/core: Fix ENODEV error for iWARP test over vlan"

[Leon Romanovsky]

On Tue, 12 Nov 2024 10:56:26 +0200, Leon Romanovsky wrote:
> The citied commit in Fixes line caused to regression for udaddy [1]
> application. It doesn't work over VLANs anymore.
> 
> Client:
>   ifconfig eth2 1.1.1.1
>   ip link add link eth2 name p0.3597 type vlan protocol 802.1Q id 3597
>   ip link set dev p0.3597 up
>   ip addr add 2.2.2.2/16 dev p0.3597
>   udaddy -S 847 -C 220 -c 2 -t 0 -s 2.2.2.3 -b 2.2.2.2
> 
> [...]

Applied, thanks!

[1/1] Revert "RDMA/core: Fix ENODEV error for iWARP test over vlan"
      https://git.kernel.org/rdma/rdma/c/6abe2a90808192

Best regards,
-- 
Leon Romanovsky <leon@kernel.org>