On 2024-10-25 09:23:55, Wenjia Zhang wrote:
>Commit c2261dd76b54 ("RDMA/device: Add ib_device_set_netdev() as an
>alternative to get_netdev") introduced an API ib_device_get_netdev.
>The SMC-R variant of the SMC protocol continued to use the old API
>ib_device_ops.get_netdev() to lookup netdev. As this commit 8d159eb2117b
>("RDMA/mlx5: Use IB set_netdev and get_netdev functions") removed the
>get_netdev callback from mlx5_ib_dev_common_roce_ops, calling
>ib_device_ops.get_netdev didn't work any more at least by using a mlx5
>device driver. Thus, using ib_device_set_netdev() now became mandatory.
>
>Replace ib_device_ops.get_netdev() with ib_device_get_netdev().
>
>Fixes: 54903572c23c ("net/smc: allow pnetid-less configuration")
>Fixes: 8d159eb2117b ("RDMA/mlx5: Use IB set_netdev and get_netdev functions")
>Reported-by: Aswin K <aswin@xxxxxxxxxxxxx>
>Reviewed-by: Gerd Bayer <gbayer@xxxxxxxxxxxxx>
>Signed-off-by: Wenjia Zhang <wenjia@xxxxxxxxxxxxx>
Reviewed-by: Dust Li <dust.li@xxxxxxxxxxxxxxxxx>
>---
> net/smc/smc_ib.c | 8 ++------
> net/smc/smc_pnet.c | 4 +---
> 2 files changed, 3 insertions(+), 9 deletions(-)
>
>diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c
>index 9297dc20bfe2..9c563cdbea90 100644
>--- a/net/smc/smc_ib.c
>+++ b/net/smc/smc_ib.c
>@@ -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;
>diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c
>index 1dd362326c0a..8566937c8903 100644
>--- a/net/smc/smc_pnet.c
>+++ b/net/smc/smc_pnet.c
>@@ -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);
>--
>2.43.0
>
