From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9023EC2D0FA for ; Wed, 13 May 2020 10:01:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 67BCB206B8 for ; Wed, 13 May 2020 10:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589364086; bh=ZtMA0SXcLcsPqa3hK5tCaZlGjRX2c1uC8VkzKO1tgxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kMpB0VAHg71rQZ4GFjIJtQrZX5MKgrM/Kq28uM11JGOmSMEvfaDj5lmcHOGCwcdh2 +knYB3hcBrLkz/oSzLyi4LPfRWDU/Q8szaoH8U1G3otv2H0pj7F2yzxYe997zTDQBj QtWgj54WkHzq7bgEECtmpl3Qyof1zzM6IEtqy6/w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387453AbgEMKBW (ORCPT ); Wed, 13 May 2020 06:01:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:51552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732860AbgEMJvG (ORCPT ); Wed, 13 May 2020 05:51:06 -0400 Received: from localhost (unknown [213.57.247.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D547220769; Wed, 13 May 2020 09:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589363465; bh=ZtMA0SXcLcsPqa3hK5tCaZlGjRX2c1uC8VkzKO1tgxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0aIs2nd565FJ27ppiI8A3pRsBsS2Xd6IwhbOHLagW0DSIdoN/Yp3xt7wjRtZnrrEH DaYviKn9EKtKiQlsxO74cwY3OEjfNQPGxR7BQMEfrKGsrhMkFrtoiy6ALQxgq+fBTb taTgjoyHdjQ+EpuZybcTz8s9xesTNCfIA6pd0Tuw= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Maor Gottlieb , linux-rdma@vger.kernel.org Subject: [PATCH rdma-next 06/14] RDMA/core: Add restrack dummy ops Date: Wed, 13 May 2020 12:50:26 +0300 Message-Id: <20200513095034.208385-7-leon@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200513095034.208385-1-leon@kernel.org> References: <20200513095034.208385-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Maor Gottlieb When fill_res_entry is not implemented by the vendor, then we just need to return 0. Reduce some code and make it more clear by set dummy ops. Signed-off-by: Maor Gottlieb Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/nldev.c | 46 ++++-------------------------- drivers/infiniband/core/restrack.c | 13 +++++++++ 2 files changed, 19 insertions(+), 40 deletions(-) diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index 8548f09746ab..8b4115bc26b2 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -446,22 +446,6 @@ static int fill_res_name_pid(struct sk_buff *msg, return err ? -EMSGSIZE : 0; } -static bool fill_res_entry(struct ib_device *dev, struct sk_buff *msg, - struct rdma_restrack_entry *res) -{ - if (!dev->ops.fill_res_entry) - return false; - return dev->ops.fill_res_entry(msg, res); -} - -static bool fill_stat_entry(struct ib_device *dev, struct sk_buff *msg, - struct rdma_restrack_entry *res) -{ - if (!dev->ops.fill_stat_entry) - return false; - return dev->ops.fill_stat_entry(msg, res); -} - static int fill_res_qp_entry(struct sk_buff *msg, bool has_cap_net_admin, struct rdma_restrack_entry *res, uint32_t port) { @@ -515,10 +499,7 @@ static int fill_res_qp_entry(struct sk_buff *msg, bool has_cap_net_admin, if (fill_res_name_pid(msg, res)) goto err; - if (fill_res_entry(dev, msg, res)) - goto err; - - return 0; + return dev->ops.fill_res_entry(msg, res); err: return -EMSGSIZE; } @@ -568,10 +549,7 @@ static int fill_res_cm_id_entry(struct sk_buff *msg, bool has_cap_net_admin, if (fill_res_name_pid(msg, res)) goto err; - if (fill_res_entry(dev, msg, res)) - goto err; - - return 0; + return dev->ops.fill_res_entry(msg, res); err: return -EMSGSIZE; } @@ -606,10 +584,7 @@ static int fill_res_cq_entry(struct sk_buff *msg, bool has_cap_net_admin, if (fill_res_name_pid(msg, res)) goto err; - if (fill_res_entry(dev, msg, res)) - goto err; - - return 0; + return dev->ops.fill_res_entry(msg, res); err: return -EMSGSIZE; } @@ -641,10 +616,7 @@ static int fill_res_mr_entry(struct sk_buff *msg, bool has_cap_net_admin, if (fill_res_name_pid(msg, res)) goto err; - if (fill_res_entry(dev, msg, res)) - goto err; - - return 0; + return dev->ops.fill_res_entry(msg, res); err: return -EMSGSIZE; } @@ -784,15 +756,9 @@ static int fill_stat_mr_entry(struct sk_buff *msg, bool has_cap_net_admin, struct ib_device *dev = mr->pd->device; if (nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_MRN, res->id)) - goto err; - - if (fill_stat_entry(dev, msg, res)) - goto err; - - return 0; + return -EMSGSIZE; -err: - return -EMSGSIZE; + return dev->ops.fill_stat_entry(msg, res); } static int fill_stat_counter_hwcounters(struct sk_buff *msg, diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c index 62fbb0ae9cb4..093b27c0bbe6 100644 --- a/drivers/infiniband/core/restrack.c +++ b/drivers/infiniband/core/restrack.c @@ -14,6 +14,17 @@ #include "cma_priv.h" #include "restrack.h" +static int fill_res_dummy(struct sk_buff *msg, + struct rdma_restrack_entry *entry) +{ + return 0; +} + +static const struct ib_device_ops restrack_dummy_ops = { + .fill_res_entry = fill_res_dummy, + .fill_stat_entry = fill_res_dummy, +}; + /** * rdma_restrack_init() - initialize and allocate resource tracking * @dev: IB device @@ -34,6 +45,8 @@ int rdma_restrack_init(struct ib_device *dev) for (i = 0; i < RDMA_RESTRACK_MAX; i++) xa_init_flags(&rt[i].xa, XA_FLAGS_ALLOC); + ib_set_device_ops(dev, &restrack_dummy_ops); + return 0; } -- 2.26.2