From patchwork Sat Jan 7 09:49:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 13092032 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 603D3C46467 for ; Sat, 7 Jan 2023 09:49:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231550AbjAGJtt (ORCPT ); Sat, 7 Jan 2023 04:49:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229525AbjAGJtf (ORCPT ); Sat, 7 Jan 2023 04:49:35 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 052417CBCA for ; Sat, 7 Jan 2023 01:49:35 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id l1-20020a17090a384100b00226f05b9595so2272995pjf.0 for ; Sat, 07 Jan 2023 01:49:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z7b+dIa8qQHA/Sr0355zYfqLJQAvAHw7gJ8jDK656W0=; b=RxId5u7U+DhvUg8S6oFV0cYC/qf7/kMk94JKSUeK0zA5v78oyrz51kWvxhNJVMRoFs demy3vq13F5YPYwgR7ppmcB9Dkgoanwj1hD5Z8AqYE3A/q9VZ9Yo+vs47dANui1f0Qps Bd+RXGYWKf2qAsvibNqsz6KJYOxLMiAJ5Ro+0iu8s+MWMbaIFxVuNvp4xQk0w4UtaWO8 EY260xwVZAsjTBe2PbJ53gmo2HpLOdJamx4aZWGG5Nh414d6NFQpIszDAsgQ0SJMBfNC Wl9CkFdFCS1lc7VmXrBaGz2Xt85ArSHYhM9r9KVKVeXG1+1ewmxYMTKGR9IcNN8lQK+a nXfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z7b+dIa8qQHA/Sr0355zYfqLJQAvAHw7gJ8jDK656W0=; b=b1ql93AtqaBo0F+/0M3KAtJSyQk+Lni5NmGDlXxXg0xi/cy3/yT4qjt9dhTib6VvMU Bn/Asz557XaXBI6VH+Wv8VeameDPTlOSv615Y7nR+BCaNmG9GXDLwV3ZjJjWcwuuf/TS dRDfkVQLbPj9hNk6zU4WOn67evBE5VV0PwPjwOfbV9lI39qTu8Zr1VESVkX4clkX9ub7 7M5QtRs1V6MOTxjKZ3KKj8RcleEW5Qn5W9vKA07a8rYmFy6TBMAWr3b13eDoQZqDMZ2G NHd/uH2RGN+apcVVzrfUo4Xw1D4SUUTvRj/+gFpvMlzQ2Tk7EIhlIjfvudom2jzJuZ+/ SQmQ== X-Gm-Message-State: AFqh2kqS46IjICU//lpt40ghkd1jKBrVWICqst6FMmxdHKwtMyOwYxzG mWS1o2eyn8JKTPSyVikembpkDHLBiim9eovDxfHp7Q== X-Google-Smtp-Source: AMrXdXuzZoYlaGMan/qzdLoA23jnRqdaCRuWt2qe5g+kxbWbNcpMnCA9dKgdwqjRYMB2YkTuRrhfVw== X-Received: by 2002:a17:902:f788:b0:192:dda4:30e2 with SMTP id q8-20020a170902f78800b00192dda430e2mr17796285pln.52.1673084974524; Sat, 07 Jan 2023 01:49:34 -0800 (PST) Received: from localhost (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id p8-20020a170902780800b0019117164732sm2298080pll.213.2023.01.07.01.49.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 01:49:33 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, michael.chan@broadcom.com, yisen.zhuang@huawei.com, salil.mehta@huawei.com, jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, tariqt@nvidia.com, saeedm@nvidia.com, leon@kernel.org, idosch@nvidia.com, petrm@nvidia.com, mailhol.vincent@wanadoo.fr, jacob.e.keller@intel.com, maximmi@nvidia.com, gal@nvidia.com Subject: [patch net-next 6/8] devlink: convert linecards dump to devlink_nl_instance_iter_dump() Date: Sat, 7 Jan 2023 10:49:07 +0100 Message-Id: <20230107094909.530239-7-jiri@resnulli.us> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230107094909.530239-1-jiri@resnulli.us> References: <20230107094909.530239-1-jiri@resnulli.us> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Jiri Pirko Benefit from recently introduced instance iteration and convert linecards .dumpit generic netlink callback to use it. Signed-off-by: Jiri Pirko --- net/devlink/devl_internal.h | 1 + net/devlink/leftover.c | 64 ++++++++++++++++--------------------- net/devlink/netlink.c | 1 + 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index 69d10b93616e..52d958c1c977 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -165,6 +165,7 @@ extern const struct devlink_gen_cmd devl_gen_info; extern const struct devlink_gen_cmd devl_gen_trap; extern const struct devlink_gen_cmd devl_gen_trap_group; extern const struct devlink_gen_cmd devl_gen_trap_policer; +extern const struct devlink_gen_cmd devl_gen_linecard; /* Ports */ int devlink_port_netdevice_event(struct notifier_block *nb, diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c index c512ddb6bd5e..c5feda997932 100644 --- a/net/devlink/leftover.c +++ b/net/devlink/leftover.c @@ -2105,50 +2105,42 @@ static int devlink_nl_cmd_linecard_get_doit(struct sk_buff *skb, return genlmsg_reply(msg, info); } -static int devlink_nl_cmd_linecard_get_dumpit(struct sk_buff *msg, - struct netlink_callback *cb) +static int devlink_nl_cmd_linecard_get_dump_one(struct sk_buff *msg, + struct devlink *devlink, + struct netlink_callback *cb) { struct devlink_nl_dump_state *state = devlink_dump_state(cb); struct devlink_linecard *linecard; - struct devlink *devlink; - int err; - - devlink_dump_for_each_instance_get(msg, state, devlink) { - int idx = 0; - - devl_lock(devlink); - if (!devl_is_registered(devlink)) - goto next_devlink; + int idx = 0; + int err = 0; - list_for_each_entry(linecard, &devlink->linecard_list, list) { - if (idx < state->idx) { - idx++; - continue; - } - mutex_lock(&linecard->state_lock); - err = devlink_nl_linecard_fill(msg, devlink, linecard, - DEVLINK_CMD_LINECARD_NEW, - NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, - NLM_F_MULTI, - cb->extack); - mutex_unlock(&linecard->state_lock); - if (err) { - devl_unlock(devlink); - devlink_put(devlink); - state->idx = idx; - goto out; - } + list_for_each_entry(linecard, &devlink->linecard_list, list) { + if (idx < state->idx) { idx++; + continue; } -next_devlink: - devl_unlock(devlink); - devlink_put(devlink); + mutex_lock(&linecard->state_lock); + err = devlink_nl_linecard_fill(msg, devlink, linecard, + DEVLINK_CMD_LINECARD_NEW, + NETLINK_CB(cb->skb).portid, + cb->nlh->nlmsg_seq, + NLM_F_MULTI, + cb->extack); + mutex_unlock(&linecard->state_lock); + if (err) { + state->idx = idx; + break; + } + idx++; } -out: - return msg->len; + + return err; } +const struct devlink_gen_cmd devl_gen_linecard = { + .dump_one = devlink_nl_cmd_linecard_get_dump_one, +}; + static struct devlink_linecard_type * devlink_linecard_type_lookup(struct devlink_linecard *linecard, const char *type) @@ -8996,7 +8988,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { { .cmd = DEVLINK_CMD_LINECARD_GET, .doit = devlink_nl_cmd_linecard_get_doit, - .dumpit = devlink_nl_cmd_linecard_get_dumpit, + .dumpit = devlink_nl_instance_iter_dump, .internal_flags = DEVLINK_NL_FLAG_NEED_LINECARD, /* can be retrieved by unprivileged users */ }, diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c index 3f2ab4360f11..b18e216e09b0 100644 --- a/net/devlink/netlink.c +++ b/net/devlink/netlink.c @@ -191,6 +191,7 @@ static const struct devlink_gen_cmd *devl_gen_cmds[] = { [DEVLINK_CMD_TRAP_GET] = &devl_gen_trap, [DEVLINK_CMD_TRAP_GROUP_GET] = &devl_gen_trap_group, [DEVLINK_CMD_TRAP_POLICER_GET] = &devl_gen_trap_policer, + [DEVLINK_CMD_LINECARD_GET] = &devl_gen_linecard, [DEVLINK_CMD_SELFTESTS_GET] = &devl_gen_selftests, };