Skip to content

Commit de88df0

Browse files
Wenjia Zhangkuba-moo
authored andcommitted
net/smc: Fix lookup of netdev by using ib_device_get_netdev()
The SMC-R variant of the SMC protocol used direct call to function ib_device_ops.get_netdev() to lookup netdev. As we used mlx5 device driver to run SMC-R, it failed to find a device, because in mlx5_ib the internal net device management for retrieving net devices was replaced by a common interface ib_device_get_netdev() in commit 8d159eb ("RDMA/mlx5: Use IB set_netdev and get_netdev functions"). Since such direct accesses to the internal net device management is not recommended at all, update the SMC-R code to use proper API ib_device_get_netdev(). Fixes: 5490357 ("net/smc: allow pnetid-less configuration") Reported-by: Aswin K <aswin@linux.ibm.com> Reviewed-by: Gerd Bayer <gbayer@linux.ibm.com> Reviewed-by: Halil Pasic <pasic@linux.ibm.com> Reviewed-by: Simon Horman <horms@kernel.org> Reviewed-by: Dust Li <dust.li@linux.alibaba.com> Reviewed-by: Wen Gu <guwen@linux.alibaba.com> Reviewed-by: Zhu Yanjun <yanjun.zhu@linux.dev> Reviewed-by: D. Wythe <alibuda@linux.alibaba.com> Signed-off-by: Wenjia Zhang <wenjia@linux.ibm.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Link: https://patch.msgid.link/20241106082612.57803-1-wenjia@linux.ibm.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 013d2c5 commit de88df0

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

net/smc/smc_ib.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -899,9 +899,7 @@ static void smc_copy_netdev_ifindex(struct smc_ib_device *smcibdev, int port)
899899
struct ib_device *ibdev = smcibdev->ibdev;
900900
struct net_device *ndev;
901901

902-
if (!ibdev->ops.get_netdev)
903-
return;
904-
ndev = ibdev->ops.get_netdev(ibdev, port + 1);
902+
ndev = ib_device_get_netdev(ibdev, port + 1);
905903
if (ndev) {
906904
smcibdev->ndev_ifidx[port] = ndev->ifindex;
907905
dev_put(ndev);
@@ -921,9 +919,7 @@ void smc_ib_ndev_change(struct net_device *ndev, unsigned long event)
921919
port_cnt = smcibdev->ibdev->phys_port_cnt;
922920
for (i = 0; i < min_t(size_t, port_cnt, SMC_MAX_PORTS); i++) {
923921
libdev = smcibdev->ibdev;
924-
if (!libdev->ops.get_netdev)
925-
continue;
926-
lndev = libdev->ops.get_netdev(libdev, i + 1);
922+
lndev = ib_device_get_netdev(libdev, i + 1);
927923
dev_put(lndev);
928924
if (lndev != ndev)
929925
continue;

net/smc/smc_pnet.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,9 +1054,7 @@ static void smc_pnet_find_rdma_dev(struct net_device *netdev,
10541054
for (i = 1; i <= SMC_MAX_PORTS; i++) {
10551055
if (!rdma_is_port_valid(ibdev->ibdev, i))
10561056
continue;
1057-
if (!ibdev->ibdev->ops.get_netdev)
1058-
continue;
1059-
ndev = ibdev->ibdev->ops.get_netdev(ibdev->ibdev, i);
1057+
ndev = ib_device_get_netdev(ibdev->ibdev, i);
10601058
if (!ndev)
10611059
continue;
10621060
dev_put(ndev);

0 commit comments

Comments
 (0)