Commit de88df01 authored by Wenjia Zhang's avatar Wenjia Zhang Committed by Jakub Kicinski
Browse files

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 8d159eb2
("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: 54903572 ("net/smc: allow pnetid-less configuration")
Reported-by: default avatarAswin K <aswin@linux.ibm.com>
Reviewed-by: default avatarGerd Bayer <gbayer@linux.ibm.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarDust Li <dust.li@linux.alibaba.com>
Reviewed-by: default avatarWen Gu <guwen@linux.alibaba.com>
Reviewed-by: default avatarZhu Yanjun <yanjun.zhu@linux.dev>
Reviewed-by: default avatarD. Wythe <alibuda@linux.alibaba.com>
Signed-off-by: default avatarWenjia Zhang <wenjia@linux.ibm.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://patch.msgid.link/20241106082612.57803-1-wenjia@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 013d2c5c

net/smc/smc_ib.c

+2 −6
Original line number Diff line number Diff line
@@ -899,9 +899,7 @@ static void smc_copy_netdev_ifindex(struct smc_ib_device *smcibdev, int port) 
	struct ib_device *ibdev = smcibdev->ibdev;

	struct net_device *ndev;



	if (!ibdev->ops.get_netdev)

		return;

	ndev = ibdev->ops.get_netdev(ibdev, port + 1);

	ndev = ib_device_get_netdev(ibdev, port + 1);

	if (ndev) {

		smcibdev->ndev_ifidx[port] = ndev->ifindex;

		dev_put(ndev);
@@ -921,9 +919,7 @@ void smc_ib_ndev_change(struct net_device *ndev, unsigned long event) 
		port_cnt = smcibdev->ibdev->phys_port_cnt;

		for (i = 0; i < min_t(size_t, port_cnt, SMC_MAX_PORTS); i++) {

			libdev = smcibdev->ibdev;

			if (!libdev->ops.get_netdev)

				continue;

			lndev = libdev->ops.get_netdev(libdev, i + 1);

			lndev = ib_device_get_netdev(libdev, i + 1);

			dev_put(lndev);

			if (lndev != ndev)

				continue;

net/smc/smc_pnet.c

+1 −3
Original line number Diff line number Diff line
@@ -1054,9 +1054,7 @@ static void smc_pnet_find_rdma_dev(struct net_device *netdev, 
		for (i = 1; i <= SMC_MAX_PORTS; i++) {

			if (!rdma_is_port_valid(ibdev->ibdev, i))

				continue;

			if (!ibdev->ibdev->ops.get_netdev)

				continue;

			ndev = ibdev->ibdev->ops.get_netdev(ibdev->ibdev, i);

			ndev = ib_device_get_netdev(ibdev->ibdev, i);

			if (!ndev)

				continue;

			dev_put(ndev);