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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD886C4332F for ; Thu, 15 Dec 2022 02:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229816AbiLOCCZ (ORCPT ); Wed, 14 Dec 2022 21:02:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbiLOCCM (ORCPT ); Wed, 14 Dec 2022 21:02:12 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DF3256D50 for ; Wed, 14 Dec 2022 18:02:10 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 62596B81AD7 for ; Thu, 15 Dec 2022 02:02:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCE4CC433F1; Thu, 15 Dec 2022 02:02:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671069728; bh=cxkt8U8GeT8kYuAL46h9iaBR64W6auCblMwMpy/d/7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fjd8FVwzpivALjLMcSUB94StwPO9QJ3DhWPz3MGurf5xIyOLK09mHDpx+uE2sFyBv xZH4e2qG67H5aEALhOC79pRVmrX9L17rO5/0LJdOgMLY9xCEGR/YjSzMwXozUjIlyy +4bhEW8rp6I4Zl4wqg595ENJ/v7EeHl0xSNzFPAMD7bs3u5Xxno4BsDnyzvW4ywE8c 3IbBuz5dFRTEN8j5rqS0KFkjpjBLsQDr/vgNYs3KCoIIVZXBcB2bLy2USi5KL6Y0ni HGYX/VbvivzUIpnIVh13LAPVYiDN0lOt5mJzzy4rti2/1vy/tXTTxJTiYBnamEHGXa Zw4Pq4HMcxQAA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, jiri@resnulli.us, jacob.e.keller@intel.com, leon@kernel.org, Jakub Kicinski Subject: [RFC net-next 10/15] devlink: restart dump based on devlink instance ids (simple) Date: Wed, 14 Dec 2022 18:01:50 -0800 Message-Id: <20221215020155.1619839-11-kuba@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221215020155.1619839-1-kuba@kernel.org> References: <20221215020155.1619839-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org xarray gives each devlink instance an id and allows us to restart walk based on that id quite neatly. This is nice both from the perspective of code brevity and from the stability of the dump (devlink instances disappearing from before the resumption point will not cause inconsistent dumps). This patch takes care of simple cases where dump->idx counts devlink instances only. Signed-off-by: Jakub Kicinski --- net/devlink/basic.c | 36 ++++++++---------------------------- net/devlink/core.c | 2 +- net/devlink/devl_internal.h | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/net/devlink/basic.c b/net/devlink/basic.c index e3cfb64990b4..0f24b321b0bb 100644 --- a/net/devlink/basic.c +++ b/net/devlink/basic.c @@ -1319,17 +1319,9 @@ static int devlink_nl_cmd_get_dumpit(struct sk_buff *msg, { struct devlink_nl_dump_state *dump = devl_dump_state(cb); struct devlink *devlink; - unsigned long index; - int idx = 0; int err; - devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) { - if (idx < dump->idx) { - idx++; - devlink_put(devlink); - continue; - } - + devlink_dump_for_each_instance_get(msg, dump, devlink) { devl_lock(devlink); err = devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW, NETLINK_CB(cb->skb).portid, @@ -1339,10 +1331,8 @@ static int devlink_nl_cmd_get_dumpit(struct sk_buff *msg, if (err) goto out; - idx++; } out: - dump->idx = idx; return msg->len; } @@ -4872,13 +4862,13 @@ static int devlink_nl_cmd_selftests_get_dumpit(struct sk_buff *msg, { struct devlink_nl_dump_state *dump = devl_dump_state(cb); struct devlink *devlink; - unsigned long index; - int idx = 0; int err = 0; - devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) { - if (idx < dump->idx || !devlink->ops->selftest_check) - goto inc; + devlink_dump_for_each_instance_get(msg, dump, devlink) { + if (!devlink->ops->selftest_check) { + devlink_put(devlink); + continue; + } devl_lock(devlink); err = devlink_nl_selftests_fill(msg, devlink, @@ -4890,15 +4880,13 @@ static int devlink_nl_cmd_selftests_get_dumpit(struct sk_buff *msg, devlink_put(devlink); break; } -inc: - idx++; + devlink_put(devlink); } if (err != -EMSGSIZE) return err; - dump->idx = idx; return msg->len; } @@ -6747,14 +6735,9 @@ static int devlink_nl_cmd_info_get_dumpit(struct sk_buff *msg, { struct devlink_nl_dump_state *dump = devl_dump_state(cb); struct devlink *devlink; - unsigned long index; - int idx = 0; int err = 0; - devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) { - if (idx < dump->idx) - goto inc; - + devlink_dump_for_each_instance_get(msg, dump, devlink) { devl_lock(devlink); err = devlink_nl_info_fill(msg, devlink, DEVLINK_CMD_INFO_GET, NETLINK_CB(cb->skb).portid, @@ -6767,15 +6750,12 @@ static int devlink_nl_cmd_info_get_dumpit(struct sk_buff *msg, devlink_put(devlink); break; } -inc: - idx++; devlink_put(devlink); } if (err != -EMSGSIZE) return err; - dump->idx = idx; return msg->len; } diff --git a/net/devlink/core.c b/net/devlink/core.c index 3a99bf84632e..371d6821315d 100644 --- a/net/devlink/core.c +++ b/net/devlink/core.c @@ -91,7 +91,7 @@ void devlink_put(struct devlink *devlink) call_rcu(&devlink->rcu, __devlink_put_rcu); } -static struct devlink * +struct devlink * devlinks_xa_find_get(struct net *net, unsigned long *indexp, void * (*xa_find_fn)(struct xarray *, unsigned long *, unsigned long, xa_mark_t)) diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index ee98f3bdcd33..a567ff77601d 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -87,6 +87,10 @@ extern struct genl_family devlink_nl_family; devlink; devlink = devlinks_xa_find_get_next(net, &index)) struct devlink * +devlinks_xa_find_get(struct net *net, unsigned long *indexp, + void * (*xa_find_fn)(struct xarray *, unsigned long *, + unsigned long, xa_mark_t)); +struct devlink * devlinks_xa_find_get_first(struct net *net, unsigned long *indexp); struct devlink * devlinks_xa_find_get_next(struct net *net, unsigned long *indexp); @@ -104,6 +108,7 @@ enum devlink_multicast_groups { /* state held across netlink dumps */ struct devlink_nl_dump_state { + unsigned long instance; int idx; union { /* DEVLINK_CMD_REGION_READ */ @@ -117,6 +122,15 @@ struct devlink_nl_dump_state { }; }; +/* Iterate over devlink pointers which were possible to get reference to. + * devlink_put() needs to be called for each iterated devlink pointer + * in loop body in order to release the reference. + */ +#define devlink_dump_for_each_instance_get(msg, dump, devlink) \ + for (; (devlink = devlinks_xa_find_get(sock_net(msg->sk), \ + &dump->instance, xa_find)); \ + dump->instance++) + extern const struct genl_small_ops devlink_nl_ops[56]; struct devlink *devlink_get_from_attrs(struct net *net, struct nlattr **attrs); -- 2.38.1