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 8BBE0C3DA7A for ; Thu, 5 Jan 2023 04:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230218AbjAEEF6 (ORCPT ); Wed, 4 Jan 2023 23:05:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbjAEEFn (ORCPT ); Wed, 4 Jan 2023 23:05:43 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06AA53725A for ; Wed, 4 Jan 2023 20:05:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 97F9561802 for ; Thu, 5 Jan 2023 04:05:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8936C433F2; Thu, 5 Jan 2023 04:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672891542; bh=9rYWZniyl+dtYqmE46qJGQWsEuXnFvQ5TBtGpEJ8Lb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o2hk65WVapHFTJsgtPtFRhANHHrbR6GKujdX5CE8hU4z/g+mLTL7UNQzuWlScpaqF qJyq+IFqko2NYEG9Lw5HD+H7uTp8BnBzLE4u7As0Lbecz6AGmMkPBzZ0VtUXBDNcgt FZKjGz6su2VUePrcQ83icpWsU9lWnJaAHnbdSFEAFauSIPQuN0SulekChbHWKY+Pht vQHrXteIp2+fUo4qQ4NQG9K3iJkoyoUWUQ/t0fmDDRSXcIXsyYdAmQf/ntLb8rBLF5 JVAVoKTwbyAAGUqIyck33fwNPyrrM4O3IKDQ5Z2fWeVykDut7dCo+ex2ZDoXbJtvXJ wq3hLJT+gItXw== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, jacob.e.keller@intel.com, jiri@resnulli.us, Jakub Kicinski , Jiri Pirko Subject: [PATCH net-next v2 08/15] devlink: drop the filter argument from devlinks_xa_find_get Date: Wed, 4 Jan 2023 20:05:24 -0800 Message-Id: <20230105040531.353563-9-kuba@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230105040531.353563-1-kuba@kernel.org> References: <20230105040531.353563-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Looks like devlinks_xa_find_get() was intended to get the mark from the @filter argument. It doesn't actually use @filter, passing DEVLINK_REGISTERED to xa_find_fn() directly. Walking marks other than registered is unlikely so drop @filter argument completely. Reviewed-by: Jiri Pirko Reviewed-by: Jacob Keller Signed-off-by: Jakub Kicinski --- net/devlink/core.c | 12 +++++------- net/devlink/devl_internal.h | 15 +++++---------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/net/devlink/core.c b/net/devlink/core.c index c084eafa17fb..3a99bf84632e 100644 --- a/net/devlink/core.c +++ b/net/devlink/core.c @@ -92,7 +92,7 @@ void devlink_put(struct devlink *devlink) } static struct devlink * -devlinks_xa_find_get(struct net *net, unsigned long *indexp, xa_mark_t filter, +devlinks_xa_find_get(struct net *net, unsigned long *indexp, void * (*xa_find_fn)(struct xarray *, unsigned long *, unsigned long, xa_mark_t)) { @@ -125,17 +125,15 @@ devlinks_xa_find_get(struct net *net, unsigned long *indexp, xa_mark_t filter, } struct devlink * -devlinks_xa_find_get_first(struct net *net, unsigned long *indexp, - xa_mark_t filter) +devlinks_xa_find_get_first(struct net *net, unsigned long *indexp) { - return devlinks_xa_find_get(net, indexp, filter, xa_find); + return devlinks_xa_find_get(net, indexp, xa_find); } struct devlink * -devlinks_xa_find_get_next(struct net *net, unsigned long *indexp, - xa_mark_t filter) +devlinks_xa_find_get_next(struct net *net, unsigned long *indexp) { - return devlinks_xa_find_get(net, indexp, filter, xa_find_after); + return devlinks_xa_find_get(net, indexp, xa_find_after); } /** diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index e8cd0e4b6227..d680783e13be 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -81,20 +81,15 @@ extern struct genl_family devlink_nl_family; * devlink_put() needs to be called for each iterated devlink pointer * in loop body in order to release the reference. */ -#define devlinks_xa_for_each_get(net, index, devlink, filter) \ - for (index = 0, \ - devlink = devlinks_xa_find_get_first(net, &index, filter); \ - devlink; devlink = devlinks_xa_find_get_next(net, &index, filter)) - #define devlinks_xa_for_each_registered_get(net, index, devlink) \ - devlinks_xa_for_each_get(net, index, devlink, DEVLINK_REGISTERED) + for (index = 0, \ + devlink = devlinks_xa_find_get_first(net, &index); \ + devlink; devlink = devlinks_xa_find_get_next(net, &index)) struct devlink * -devlinks_xa_find_get_first(struct net *net, unsigned long *indexp, - xa_mark_t filter); +devlinks_xa_find_get_first(struct net *net, unsigned long *indexp); struct devlink * -devlinks_xa_find_get_next(struct net *net, unsigned long *indexp, - xa_mark_t filter); +devlinks_xa_find_get_next(struct net *net, unsigned long *indexp); /* Netlink */ #define DEVLINK_NL_FLAG_NEED_PORT BIT(0) -- 2.38.1