From patchwork Thu Mar 29 16:09:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Wise X-Patchwork-Id: 10316121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3CB716037E for ; Thu, 29 Mar 2018 20:30:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EC012A4F2 for ; Thu, 29 Mar 2018 20:30:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 234012A4F7; Thu, 29 Mar 2018 20:30:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=2.0 tests=BAYES_00, DATE_IN_PAST_03_06, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABB352A4F2 for ; Thu, 29 Mar 2018 20:30:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751403AbeC2UaF (ORCPT ); Thu, 29 Mar 2018 16:30:05 -0400 Received: from opengridcomputing.com ([70.118.0.34]:49950 "EHLO smtp.opengridcomputing.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751070AbeC2UaF (ORCPT ); Thu, 29 Mar 2018 16:30:05 -0400 Received: by smtp.opengridcomputing.com (Postfix, from userid 503) id 70AE329ECE; Thu, 29 Mar 2018 15:30:04 -0500 (CDT) Message-Id: <171dafa48f9bab494d1fe766ae662e264af222a2.1522341686.git.swise@opengridcomputing.com> In-Reply-To: References: From: Steve Wise Date: Thu, 29 Mar 2018 09:09:51 -0700 Subject: [PATCH v2 rdma-next 3/5] RDMA/nldev: add provider-specific device/port tracking To: jgg@mellanox.com, dledford@redhat.com Cc: leon@kernel.org, linux-rdma@vger.kernel.org Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add fill_dev_info and fill_port_info functions to rdma_restrack_root. This allows providers to have provider-specific fill functions for device and port restrack operations. Signed-off-by: Steve Wise --- drivers/infiniband/core/nldev.c | 35 +++++++++++++++++++++++++++++------ include/rdma/restrack.h | 15 +++++++++++++++ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index 99df8d4..902517f 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -115,6 +115,22 @@ static int provider_fill_res_entry(struct rdma_restrack_root *resroot, resroot->fill_res_entry(msg, cb, res) : 0; } +static int provider_fill_dev_info(struct sk_buff *msg, + struct netlink_callback *cb, + struct ib_device *device) +{ + return device->res.fill_dev_info ? + device->res.fill_dev_info(msg, cb, device) : 0; +} + +static int provider_fill_port_info(struct sk_buff *msg, + struct netlink_callback *cb, + struct ib_device *device, u32 port) +{ + return device->res.fill_port_info ? + device->res.fill_port_info(msg, cb, device, port) : 0; +} + static int fill_nldev_handle(struct sk_buff *msg, struct ib_device *device) { if (nla_put_u32(msg, RDMA_NLDEV_ATTR_DEV_INDEX, device->index)) @@ -125,7 +141,8 @@ static int fill_nldev_handle(struct sk_buff *msg, struct ib_device *device) return 0; } -static int fill_dev_info(struct sk_buff *msg, struct ib_device *device) +static int fill_dev_info(struct sk_buff *msg, struct netlink_callback *cb, + struct ib_device *device) { char fw[IB_FW_VERSION_NAME_MAX]; @@ -156,10 +173,14 @@ static int fill_dev_info(struct sk_buff *msg, struct ib_device *device) return -EMSGSIZE; if (nla_put_u8(msg, RDMA_NLDEV_ATTR_DEV_NODE_TYPE, device->node_type)) return -EMSGSIZE; + + if (provider_fill_dev_info(msg, cb, device)) + return -EMSGSIZE; + return 0; } -static int fill_port_info(struct sk_buff *msg, +static int fill_port_info(struct sk_buff *msg, struct netlink_callback *cb, struct ib_device *device, u32 port) { struct ib_port_attr attr; @@ -195,6 +216,8 @@ static int fill_port_info(struct sk_buff *msg, return -EMSGSIZE; if (nla_put_u8(msg, RDMA_NLDEV_ATTR_PORT_PHYS_STATE, attr.phys_state)) return -EMSGSIZE; + if (provider_fill_port_info(msg, cb, device, port)) + return -EMSGSIZE; return 0; } @@ -554,7 +577,7 @@ static int nldev_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_GET), 0, 0); - err = fill_dev_info(msg, device); + err = fill_dev_info(msg, NULL, device); if (err) goto err_free; @@ -585,7 +608,7 @@ static int _nldev_get_dumpit(struct ib_device *device, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_GET), 0, NLM_F_MULTI); - if (fill_dev_info(skb, device)) { + if (fill_dev_info(skb, cb, device)) { nlmsg_cancel(skb, nlh); goto out; } @@ -645,7 +668,7 @@ static int nldev_port_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_GET), 0, 0); - err = fill_port_info(msg, device, port); + err = fill_port_info(msg, NULL, device, port); if (err) goto err_free; @@ -705,7 +728,7 @@ static int nldev_port_get_dumpit(struct sk_buff *skb, RDMA_NLDEV_CMD_PORT_GET), 0, NLM_F_MULTI); - if (fill_port_info(skb, device, p)) { + if (fill_port_info(skb, cb, device, p)) { nlmsg_cancel(skb, nlh); goto out; } diff --git a/include/rdma/restrack.h b/include/rdma/restrack.h index bd3cd9a..936b56f 100644 --- a/include/rdma/restrack.h +++ b/include/rdma/restrack.h @@ -45,6 +45,7 @@ enum rdma_restrack_type { #define RDMA_RESTRACK_HASH_BITS 8 struct rdma_restrack_entry; +struct ib_device; /** * struct rdma_restrack_root - main resource tracking management @@ -67,6 +68,20 @@ struct rdma_restrack_root { int (*fill_res_entry)(struct sk_buff *msg, struct netlink_callback *cb, struct rdma_restrack_entry *entry); + /** + * @fill_dev_info: provider-specific fill function + * + * Allows rdma providers to add their own device attributes. + */ + int (*fill_dev_info)(struct sk_buff *msg, struct netlink_callback *cb, + struct ib_device *device); + /** + * @fill_port_info: provider-specific fill function + * + * Allows rdma providers to add their own port attributes. + */ + int (*fill_port_info)(struct sk_buff *msg, struct netlink_callback *cb, + struct ib_device *device, u32 port); }; /**