From nobody Mon Apr 6 21:57:12 2026 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 1FE4BECAAD5 for ; Fri, 2 Sep 2022 11:22:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235842AbiIBLWv (ORCPT ); Fri, 2 Sep 2022 07:22:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235042AbiIBLWf (ORCPT ); Fri, 2 Sep 2022 07:22:35 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C42DFC6954; Fri, 2 Sep 2022 04:22:34 -0700 (PDT) Received: from dggpeml500026.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MJwQx0HSJzlWcW; Fri, 2 Sep 2022 19:19:05 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 2 Sep 2022 19:22:31 +0800 From: Zhengchao Shao To: , , , , , , , , , , CC: , , , , , , , , , , , , Subject: [PATCH net-next 02/22] net: sched: act_bpf: get rid of tcf_bpf_walker and tcf_bpf_search Date: Fri, 2 Sep 2022 19:24:26 +0800 Message-ID: <20220902112446.29858-3-shaozhengchao@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220902112446.29858-1-shaozhengchao@huawei.com> References: <20220902112446.29858-1-shaozhengchao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500026.china.huawei.com (7.185.36.106) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving bpf_net_id when registering act_bpf_ops. And then remove the walk and lookup hook functions in act_bpf. Signed-off-by: Zhengchao Shao --- net/sched/act_bpf.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index fea2d78b9ddc..d7fc5c4157d6 100644 --- a/net/sched/act_bpf.c +++ b/net/sched/act_bpf.c @@ -390,33 +390,15 @@ static void tcf_bpf_cleanup(struct tc_action *act) tcf_bpf_cfg_cleanup(&tmp); } =20 -static int tcf_bpf_walker(struct net *net, struct sk_buff *skb, - struct netlink_callback *cb, int type, - const struct tc_action_ops *ops, - struct netlink_ext_ack *extack) -{ - struct tc_action_net *tn =3D net_generic(net, bpf_net_id); - - return tcf_generic_walker(tn, skb, cb, type, ops, extack); -} - -static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index) -{ - struct tc_action_net *tn =3D net_generic(net, bpf_net_id); - - return tcf_idr_search(tn, a, index); -} - static struct tc_action_ops act_bpf_ops __read_mostly =3D { .kind =3D "bpf", .id =3D TCA_ID_BPF, + .net_id =3D &bpf_net_id, .owner =3D THIS_MODULE, .act =3D tcf_bpf_act, .dump =3D tcf_bpf_dump, .cleanup =3D tcf_bpf_cleanup, .init =3D tcf_bpf_init, - .walk =3D tcf_bpf_walker, - .lookup =3D tcf_bpf_search, .size =3D sizeof(struct tcf_bpf), }; =20 --=20 2.17.1