Patch "RDMA/core: Fix ENODEV error for iWARP test over vlan" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    RDMA/core: Fix ENODEV error for iWARP test over vlan

to the 6.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     rdma-core-fix-enodev-error-for-iwarp-test-over-vlan.patch
and it can be found in the queue-6.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e7ae14ea3233ea69ae967851bee264a590e52c7b
Author: Anumula Murali Mohan Reddy <anumula@xxxxxxxxxxx>
Date:   Tue Dec 3 19:30:53 2024 +0530

    RDMA/core: Fix ENODEV error for iWARP test over vlan
    
    [ Upstream commit a4048c83fd87c65657a4acb17d639092d4b6133d ]
    
    If traffic is over vlan, cma_validate_port() fails to match
    net_device ifindex with bound_if_index and results in ENODEV error.
    As iWARP gid table is static, it contains entry corresponding  to
    only one net device which is either real netdev or vlan netdev for
    cases like  siw attached to a vlan interface.
    This patch fixes the issue by assigning bound_if_index with net
    device index, if real net device obtained from bound if index matches
    with net device retrieved from gid table
    
    Fixes: f8ef1be816bf ("RDMA/cma: Avoid GID lookups on iWARP devices")
    Link: https://lore.kernel.org/all/ZzNgdrjo1kSCGbRz@xxxxxxxxxxx/
    Signed-off-by: Anumula Murali Mohan Reddy <anumula@xxxxxxxxxxx>
    Signed-off-by: Potnuri Bharat Teja <bharat@xxxxxxxxxxx>
    Link: https://patch.msgid.link/20241203140052.3985-1-anumula@xxxxxxxxxxx
    Signed-off-by: Leon Romanovsky <leon@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 64ace0b968f0..91db10515d74 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -690,6 +690,7 @@ cma_validate_port(struct ib_device *device, u32 port,
 	int bound_if_index = dev_addr->bound_dev_if;
 	int dev_type = dev_addr->dev_type;
 	struct net_device *ndev = NULL;
+	struct net_device *pdev = NULL;
 
 	if (!rdma_dev_access_netns(device, id_priv->id.route.addr.dev_addr.net))
 		goto out;
@@ -714,6 +715,21 @@ cma_validate_port(struct ib_device *device, u32 port,
 
 		rcu_read_lock();
 		ndev = rcu_dereference(sgid_attr->ndev);
+		if (ndev->ifindex != bound_if_index) {
+			pdev = dev_get_by_index_rcu(dev_addr->net, bound_if_index);
+			if (pdev) {
+				if (is_vlan_dev(pdev)) {
+					pdev = vlan_dev_real_dev(pdev);
+					if (ndev->ifindex == pdev->ifindex)
+						bound_if_index = pdev->ifindex;
+				}
+				if (is_vlan_dev(ndev)) {
+					pdev = vlan_dev_real_dev(ndev);
+					if (bound_if_index == pdev->ifindex)
+						bound_if_index = ndev->ifindex;
+				}
+			}
+		}
 		if (!net_eq(dev_net(ndev), dev_addr->net) ||
 		    ndev->ifindex != bound_if_index) {
 			rdma_put_gid_attr(sgid_attr);