lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20220902112446.29858-21-shaozhengchao@huawei.com> Date: Fri, 2 Sep 2022 19:24:44 +0800 From: Zhengchao Shao <shaozhengchao@...wei.com> To: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>, <bpf@...r.kernel.org>, <davem@...emloft.net>, <edumazet@...gle.com>, <kuba@...nel.org>, <pabeni@...hat.com>, <jhs@...atatu.com>, <xiyou.wangcong@...il.com>, <jiri@...nulli.us>, <martin.lau@...ux.dev> CC: <daniel@...earbox.net>, <john.fastabend@...il.com>, <ast@...nel.org>, <andrii@...nel.org>, <song@...nel.org>, <yhs@...com>, <kpsingh@...nel.org>, <sdf@...gle.com>, <haoluo@...gle.com>, <jolsa@...nel.org>, <weiyongjun1@...wei.com>, <yuehaibing@...wei.com>, <shaozhengchao@...wei.com> Subject: [PATCH net-next 20/22] net: sched: act_tunnel_key: get rid of tunnel_key_walker and tunnel_key_search Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving tunnel_key_net_id when registering act_tunnel_key_ops. And then remove the walk and lookup hook functions in act_tunnel_key. Signed-off-by: Zhengchao Shao <shaozhengchao@...wei.com> --- net/sched/act_tunnel_key.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c index 856dc23cef8c..47bc251c82ec 100644 --- a/net/sched/act_tunnel_key.c +++ b/net/sched/act_tunnel_key.c @@ -770,23 +770,6 @@ static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a, return -1; } -static int tunnel_key_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 = net_generic(net, tunnel_key_net_id); - - return tcf_generic_walker(tn, skb, cb, type, ops, extack); -} - -static int tunnel_key_search(struct net *net, struct tc_action **a, u32 index) -{ - struct tc_action_net *tn = net_generic(net, tunnel_key_net_id); - - return tcf_idr_search(tn, a, index); -} - static void tcf_tunnel_encap_put_tunnel(void *priv) { struct ip_tunnel_info *tunnel = priv; @@ -845,13 +828,12 @@ static int tcf_tunnel_key_offload_act_setup(struct tc_action *act, static struct tc_action_ops act_tunnel_key_ops = { .kind = "tunnel_key", .id = TCA_ID_TUNNEL_KEY, + .net_id = &tunnel_key_net_id, .owner = THIS_MODULE, .act = tunnel_key_act, .dump = tunnel_key_dump, .init = tunnel_key_init, .cleanup = tunnel_key_release, - .walk = tunnel_key_walker, - .lookup = tunnel_key_search, .offload_act_setup = tcf_tunnel_key_offload_act_setup, .size = sizeof(struct tcf_tunnel_key), }; -- 2.17.1
Powered by blists - more mailing lists