From: Mark Bloch <mbloch@nvidia.com>
Date: Mon, 9 Sep 2024 17:30:20 +0000 (+0300)
Subject: RDMA/mlx5: Obtain upper net device only when needed
X-Git-Tag: v6.12-rc1~72^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ed7f9e239938a0cfaf3689e2f545229ecabec06;p=thirdparty%2Fkernel%2Flinux.git

RDMA/mlx5: Obtain upper net device only when needed

Report the upper device's state as the RDMA port state only in RoCE LAG or
switchdev LAG.

Fixes: 27f9e0ccb6da ("net/mlx5: Lag, Add single RDMA device in multiport mode")
Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Michael Guralnik <michaelgur@nvidia.com>
Link: https://patch.msgid.link/20240909173025.30422-3-michaelgur@nvidia.com
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
---

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index f09900435aa83..e78d50c74bc8f 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -558,7 +558,7 @@ static int mlx5_query_port_roce(struct ib_device *device, u32 port_num,
 	if (!ndev)
 		goto out;
 
-	if (dev->lag_active) {
+	if (mlx5_lag_is_roce(mdev) || mlx5_lag_is_sriov(mdev)) {
 		rcu_read_lock();
 		upper = netdev_master_upper_dev_get_rcu(ndev);
 		if (upper) {