* [PATCH for-next v1] RDMA/nldev: Add support for reporting ipoib netdev
@ 2023-09-15 18:37 Kamal Heib
2023-09-18 11:52 ` Leon Romanovsky
2023-09-18 12:30 ` Jason Gunthorpe
0 siblings, 2 replies; 3+ messages in thread
From: Kamal Heib @ 2023-09-15 18:37 UTC (permalink / raw)
To: linux-rdma; +Cc: Jason Gunthorpe, Leon Romanovsky, Kamal Heib
This patch adds support for reporting the ipoib net device for a given
RDMA device by calling ib_get_net_dev_by_params() when filling the
port's info.
$ rdma link show mlx5_0/1
link mlx5_0/1 subnet_prefix fe80:0000:0000:0000 lid 66 sm_lid 3 lmc 0
state ACTIVE physical_state LINK_UP netdev ibp196s0f0
Signed-off-by: Kamal Heib <kheib@redhat.com>
---
v1: Check namespace and query pkey.
---
drivers/infiniband/core/nldev.c | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index d5d3e4f0de77..f3fa8143cdc7 100644
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -308,10 +308,12 @@ static int fill_port_info(struct sk_buff *msg,
struct ib_device *device, u32 port,
const struct net *net)
{
+ struct net_device *ipoib_netdev = NULL;
struct net_device *netdev = NULL;
struct ib_port_attr attr;
- int ret;
u64 cap_flags = 0;
+ u16 pkey;
+ int ret;
if (fill_nldev_handle(msg, device))
return -EMSGSIZE;
@@ -340,6 +342,26 @@ static int fill_port_info(struct sk_buff *msg,
return -EMSGSIZE;
if (nla_put_u8(msg, RDMA_NLDEV_ATTR_LMC, attr.lmc))
return -EMSGSIZE;
+
+ ret = ib_query_pkey(device, port, 0, &pkey);
+ if (ret)
+ goto out;
+
+ ipoib_netdev = ib_get_net_dev_by_params(device, port,
+ pkey,
+ NULL, NULL);
+ if (ipoib_netdev && net_eq(dev_net(ipoib_netdev), net)) {
+ ret = nla_put_u32(msg,
+ RDMA_NLDEV_ATTR_NDEV_INDEX,
+ ipoib_netdev->ifindex);
+ if (ret)
+ goto out;
+ ret = nla_put_string(msg,
+ RDMA_NLDEV_ATTR_NDEV_NAME,
+ ipoib_netdev->name);
+ if (ret)
+ goto out;
+ }
}
if (nla_put_u8(msg, RDMA_NLDEV_ATTR_PORT_STATE, attr.state))
return -EMSGSIZE;
@@ -357,6 +379,9 @@ static int fill_port_info(struct sk_buff *msg,
}
out:
+ if (ipoib_netdev)
+ dev_put(ipoib_netdev);
+
if (netdev)
dev_put(netdev);
return ret;
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH for-next v1] RDMA/nldev: Add support for reporting ipoib netdev
2023-09-15 18:37 [PATCH for-next v1] RDMA/nldev: Add support for reporting ipoib netdev Kamal Heib
@ 2023-09-18 11:52 ` Leon Romanovsky
2023-09-18 12:30 ` Jason Gunthorpe
1 sibling, 0 replies; 3+ messages in thread
From: Leon Romanovsky @ 2023-09-18 11:52 UTC (permalink / raw)
To: Kamal Heib; +Cc: linux-rdma, Jason Gunthorpe
On Fri, Sep 15, 2023 at 02:37:57PM -0400, Kamal Heib wrote:
> This patch adds support for reporting the ipoib net device for a given
> RDMA device by calling ib_get_net_dev_by_params() when filling the
> port's info.
>
> $ rdma link show mlx5_0/1
> link mlx5_0/1 subnet_prefix fe80:0000:0000:0000 lid 66 sm_lid 3 lmc 0
> state ACTIVE physical_state LINK_UP netdev ibp196s0f0
>
> Signed-off-by: Kamal Heib <kheib@redhat.com>
> ---
> v1: Check namespace and query pkey.
> ---
> drivers/infiniband/core/nldev.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
> index d5d3e4f0de77..f3fa8143cdc7 100644
> --- a/drivers/infiniband/core/nldev.c
> +++ b/drivers/infiniband/core/nldev.c
> @@ -308,10 +308,12 @@ static int fill_port_info(struct sk_buff *msg,
> struct ib_device *device, u32 port,
> const struct net *net)
> {
> + struct net_device *ipoib_netdev = NULL;
> struct net_device *netdev = NULL;
> struct ib_port_attr attr;
> - int ret;
> u64 cap_flags = 0;
> + u16 pkey;
> + int ret;
>
> if (fill_nldev_handle(msg, device))
> return -EMSGSIZE;
> @@ -340,6 +342,26 @@ static int fill_port_info(struct sk_buff *msg,
> return -EMSGSIZE;
> if (nla_put_u8(msg, RDMA_NLDEV_ATTR_LMC, attr.lmc))
> return -EMSGSIZE;
> +
> + ret = ib_query_pkey(device, port, 0, &pkey);
> + if (ret)
> + goto out;
> +
> + ipoib_netdev = ib_get_net_dev_by_params(device, port,
> + pkey,
> + NULL, NULL);
> + if (ipoib_netdev && net_eq(dev_net(ipoib_netdev), net)) {
> + ret = nla_put_u32(msg,
> + RDMA_NLDEV_ATTR_NDEV_INDEX,
> + ipoib_netdev->ifindex);
> + if (ret)
> + goto out;
> + ret = nla_put_string(msg,
> + RDMA_NLDEV_ATTR_NDEV_NAME,
> + ipoib_netdev->name);
> + if (ret)
> + goto out;
> + }
> }
> if (nla_put_u8(msg, RDMA_NLDEV_ATTR_PORT_STATE, attr.state))
> return -EMSGSIZE;
You will leak ipoib_netdev here, need to change return to be "goto out".
Thanks
> @@ -357,6 +379,9 @@ static int fill_port_info(struct sk_buff *msg,
> }
>
> out:
> + if (ipoib_netdev)
> + dev_put(ipoib_netdev);
> +
> if (netdev)
> dev_put(netdev);
> return ret;
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH for-next v1] RDMA/nldev: Add support for reporting ipoib netdev
2023-09-15 18:37 [PATCH for-next v1] RDMA/nldev: Add support for reporting ipoib netdev Kamal Heib
2023-09-18 11:52 ` Leon Romanovsky
@ 2023-09-18 12:30 ` Jason Gunthorpe
1 sibling, 0 replies; 3+ messages in thread
From: Jason Gunthorpe @ 2023-09-18 12:30 UTC (permalink / raw)
To: Kamal Heib; +Cc: linux-rdma, Leon Romanovsky
On Fri, Sep 15, 2023 at 02:37:57PM -0400, Kamal Heib wrote:
> This patch adds support for reporting the ipoib net device for a given
> RDMA device by calling ib_get_net_dev_by_params() when filling the
> port's info.
>
> $ rdma link show mlx5_0/1
> link mlx5_0/1 subnet_prefix fe80:0000:0000:0000 lid 66 sm_lid 3 lmc 0
> state ACTIVE physical_state LINK_UP netdev ibp196s0f0
>
> Signed-off-by: Kamal Heib <kheib@redhat.com>
> ---
> v1: Check namespace and query pkey.
> ---
> drivers/infiniband/core/nldev.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
> index d5d3e4f0de77..f3fa8143cdc7 100644
> --- a/drivers/infiniband/core/nldev.c
> +++ b/drivers/infiniband/core/nldev.c
> @@ -308,10 +308,12 @@ static int fill_port_info(struct sk_buff *msg,
> struct ib_device *device, u32 port,
> const struct net *net)
> {
> + struct net_device *ipoib_netdev = NULL;
> struct net_device *netdev = NULL;
> struct ib_port_attr attr;
> - int ret;
> u64 cap_flags = 0;
> + u16 pkey;
> + int ret;
>
> if (fill_nldev_handle(msg, device))
> return -EMSGSIZE;
> @@ -340,6 +342,26 @@ static int fill_port_info(struct sk_buff *msg,
> return -EMSGSIZE;
> if (nla_put_u8(msg, RDMA_NLDEV_ATTR_LMC, attr.lmc))
> return -EMSGSIZE;
> +
> + ret = ib_query_pkey(device, port, 0, &pkey);
> + if (ret)
> + goto out;
That doesn't really make any sense..
The whole idea there is only one ipoib device doesn't even make sense.
I still don't like this at all.
> +
> + ipoib_netdev = ib_get_net_dev_by_params(device, port,
> + pkey,
> + NULL, NULL);
> + if (ipoib_netdev && net_eq(dev_net(ipoib_netdev), net)) {
> + ret = nla_put_u32(msg,
> + RDMA_NLDEV_ATTR_NDEV_INDEX,
> + ipoib_netdev->ifindex);
> + if (ret)
> + goto out;
> + ret = nla_put_string(msg,
> + RDMA_NLDEV_ATTR_NDEV_NAME,
> + ipoib_netdev->name);
> + if (ret)
> + goto out;
and I don't think the existing netlink attributes should be redefined
to be about ipoib
Jason
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-18 12:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 18:37 [PATCH for-next v1] RDMA/nldev: Add support for reporting ipoib netdev Kamal Heib
2023-09-18 11:52 ` Leon Romanovsky
2023-09-18 12:30 ` Jason Gunthorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox