net_sched: initialize net pointer inside tcf_exts_init()
Subsystems (5)
PATCH 1/1 net_sched: initialize net pointer inside tcf_exts_init()
For tcindex filter, it is too late to initialize the net pointer in tcf_exts_validate(), as tcf_exts_get_net() requires a non-NULL net pointer. We can just move its initialization into tcf_exts_init(), which just requires an additional parameter.
This makes the code in tcindex_alloc_perfect_hash() prettier.
--- include/net/pkt_cls.h | 5 +++-- net/sched/cls_api.c | 1 - net/sched/cls_basic.c | 2 +- net/sched/cls_bpf.c | 2 +- net/sched/cls_cgroup.c | 2 +- net/sched/cls_flow.c | 2 +- net/sched/cls_flower.c | 2 +- net/sched/cls_fw.c | 5 +++-- net/sched/cls_matchall.c | 2 +- net/sched/cls_route.c | 2 +- net/sched/cls_rsvp.h | 7 ++++--- net/sched/cls_tcindex.c | 19 +++++++++---------- net/sched/cls_u32.c | 8 ++++---- 13 files changed, 30 insertions(+), 29 deletions(-)
include/net/pkt_cls.h +3 -2
@@ -289,12 +289,13 @@ struct tcf_exts {int police; }; -static inline int tcf_exts_init (struct tcf_exts *exts,int action,int police) +static inline int tcf_exts_init (struct tcf_exts *exts,struct net *net, +int action,int police) {#ifdef CONFIG_NET_CLS_ACT exts->type =0 ; exts->nr_actions =0 ; - exts->net =NULL ; + exts->net = net; exts->actions =kcalloc (TCA_ACT_MAX_PRIO ,sizeof (struct tc_action *),GFP_KERNEL );if (!exts->actions)
net/sched/cls_api.c +0 -1
@@ -3049,7 +3049,6 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,return err; exts->nr_actions = err; } - exts->net = net; }#else if ((exts->action && tb[exts->action]) ||
net/sched/cls_basic.c +1 -1
@@ -199,7 +199,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,if (!fnew)return -ENOBUFS ; - err =tcf_exts_init (&fnew->exts,TCA_BASIC_ACT ,TCA_BASIC_POLICE ); + err =tcf_exts_init (&fnew->exts, net,TCA_BASIC_ACT ,TCA_BASIC_POLICE );if (err <0 ) goto errout;
net/sched/cls_bpf.c +1 -1
@@ -477,7 +477,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,if (!prog)return -ENOBUFS ; - ret =tcf_exts_init (&prog->exts,TCA_BPF_ACT ,TCA_BPF_POLICE ); + ret =tcf_exts_init (&prog->exts, net,TCA_BPF_ACT ,TCA_BPF_POLICE );if (ret <0 ) goto errout;
net/sched/cls_cgroup.c +1 -1
@@ -99,7 +99,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,if (!new)return -ENOBUFS ; - err =tcf_exts_init (&new->exts,TCA_CGROUP_ACT ,TCA_CGROUP_POLICE ); + err =tcf_exts_init (&new->exts, net,TCA_CGROUP_ACT ,TCA_CGROUP_POLICE );if (err <0 ) goto errout; new->handle = handle;
net/sched/cls_flow.c +1 -1
@@ -441,7 +441,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,if (err <0 ) goto err1; - err =tcf_exts_init (&fnew->exts,TCA_FLOW_ACT ,TCA_FLOW_POLICE ); + err =tcf_exts_init (&fnew->exts, net,TCA_FLOW_ACT ,TCA_FLOW_POLICE );if (err <0 ) goto err2;
net/sched/cls_flower.c +1 -1
@@ -1344,7 +1344,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, goto errout_tb; } - err =tcf_exts_init (&fnew->exts,TCA_FLOWER_ACT ,0 ); + err =tcf_exts_init (&fnew->exts, net,TCA_FLOWER_ACT ,0 );if (err <0 ) goto errout;
net/sched/cls_fw.c +3 -2
@@ -285,7 +285,8 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,#endif /* CONFIG_NET_CLS_IND */ fnew->tp = f->tp; - err =tcf_exts_init (&fnew->exts,TCA_FW_ACT ,TCA_FW_POLICE ); + err =tcf_exts_init (&fnew->exts, net,TCA_FW_ACT , +TCA_FW_POLICE );if (err <0 ) {kfree (fnew);return err;
@@ -334,7 +335,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,if (f ==NULL )return -ENOBUFS ; - err =tcf_exts_init (&f->exts,TCA_FW_ACT ,TCA_FW_POLICE ); + err =tcf_exts_init (&f->exts, net,TCA_FW_ACT ,TCA_FW_POLICE );if (err <0 ) goto errout; f->id = handle;
net/sched/cls_matchall.c +1 -1
@@ -191,7 +191,7 @@ static int mall_change(struct net *net, struct sk_buff *in_skb,if (!new)return -ENOBUFS ; - err =tcf_exts_init (&new->exts,TCA_MATCHALL_ACT ,0 ); + err =tcf_exts_init (&new->exts, net,TCA_MATCHALL_ACT ,0 );if (err) goto err_exts_init;
net/sched/cls_route.c +1 -1
@@ -497,7 +497,7 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,if (!f) goto errout; - err =tcf_exts_init (&f->exts,TCA_ROUTE4_ACT ,TCA_ROUTE4_POLICE ); + err =tcf_exts_init (&f->exts, net,TCA_ROUTE4_ACT ,TCA_ROUTE4_POLICE );if (err <0 ) goto errout;
net/sched/cls_rsvp.h +4 -3
@@ -501,7 +501,7 @@ static int rsvp_change(struct net *net, struct sk_buff *in_skb,if (err <0 )return err; - err =tcf_exts_init (&e,TCA_RSVP_ACT ,TCA_RSVP_POLICE ); + err =tcf_exts_init (&e, net,TCA_RSVP_ACT ,TCA_RSVP_POLICE );if (err <0 )return err; err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, ovr, true,
@@ -523,7 +523,8 @@ static int rsvp_change(struct net *net, struct sk_buff *in_skb, goto errout2; } - err =tcf_exts_init (&n->exts,TCA_RSVP_ACT ,TCA_RSVP_POLICE ); + err =tcf_exts_init (&n->exts, net,TCA_RSVP_ACT , +TCA_RSVP_POLICE );if (err <0 ) {kfree (n); goto errout2;
@@ -551,7 +552,7 @@ static int rsvp_change(struct net *net, struct sk_buff *in_skb,if (f ==NULL ) goto errout2; - err =tcf_exts_init (&f->exts,TCA_RSVP_ACT ,TCA_RSVP_POLICE ); + err =tcf_exts_init (&f->exts, net,TCA_RSVP_ACT ,TCA_RSVP_POLICE );if (err <0 ) goto errout; h2 =16 ;
net/sched/cls_tcindex.c +9 -10
@@ -246,10 +246,12 @@ static const struct nla_policy tcindex_policy[TCA_TCINDEX_MAX + 1] = { [TCA_TCINDEX_CLASSID] = { .type = NLA_U32 }, }; -static int tcindex_filter_result_init (struct tcindex_filter_result *r) +static int tcindex_filter_result_init (struct tcindex_filter_result *r, +struct net *net) {memset (r,0 ,sizeof (*r)); -return tcf_exts_init (&r->exts,TCA_TCINDEX_ACT ,TCA_TCINDEX_POLICE ); +return tcf_exts_init (&r->exts, net,TCA_TCINDEX_ACT , +TCA_TCINDEX_POLICE ); }static void tcindex_partial_destroy_work (struct work_struct *work)
@@ -281,13 +283,10 @@ static int tcindex_alloc_perfect_hash(struct net *net, struct tcindex_data *cp)return -ENOMEM ;for (i =0 ; i < cp->hash; i++) { - err =tcf_exts_init (&cp->perfect[i].exts, + err =tcf_exts_init (&cp->perfect[i].exts, net,TCA_TCINDEX_ACT ,TCA_TCINDEX_POLICE );if (err <0 ) goto errout; -#ifdef CONFIG_NET_CLS_ACT - cp->perfect[i].exts.net = net; -#endif }return 0 ;
@@ -310,7 +309,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,int err, balloc =0 ;struct tcf_exts e; - err =tcf_exts_init (&e,TCA_TCINDEX_ACT ,TCA_TCINDEX_POLICE ); + err =tcf_exts_init (&e, net,TCA_TCINDEX_ACT ,TCA_TCINDEX_POLICE );if (err <0 )return err; err =tcf_exts_validate (net, tp, tb, est, &e, ovr, true, extack);
@@ -344,7 +343,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, } cp->h = p->h; - err =tcindex_filter_result_init (&new_filter_result); + err =tcindex_filter_result_init (&new_filter_result, net);if (err <0 ) goto errout1;if (old_r)
@@ -431,7 +430,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, goto errout_alloc; f->key = handle; f->next =NULL ; - err =tcindex_filter_result_init (&f->result); + err =tcindex_filter_result_init (&f->result, net);if (err <0 ) {kfree (f); goto errout_alloc;
@@ -444,7 +443,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, }if (old_r && old_r != r) { - err =tcindex_filter_result_init (old_r); + err =tcindex_filter_result_init (old_r, net);if (err <0 ) {kfree (f); goto errout_alloc;
net/sched/cls_u32.c +4 -4
@@ -804,7 +804,7 @@ static void u32_replace_knode(struct tcf_proto *tp, struct tc_u_common *tp_c,rcu_assign_pointer (*ins, n); } -static struct tc_u_knode *u32_init_knode (struct tcf_proto *tp, +static struct tc_u_knode *u32_init_knode (struct net *net,struct tcf_proto *tp,struct tc_u_knode *n) {struct tc_u_hnode *ht =rtnl_dereference (n->ht_down);
@@ -849,7 +849,7 @@ static struct tc_u_knode *u32_init_knode(struct tcf_proto *tp,#endif memcpy (&new->sel, s,sizeof (*s) + s->nkeys*sizeof (struct tc_u32_key )); -if (tcf_exts_init (&new->exts,TCA_U32_ACT ,TCA_U32_POLICE )) { +if (tcf_exts_init (&new->exts, net,TCA_U32_ACT ,TCA_U32_POLICE )) {kfree (new);return NULL ; }
@@ -911,7 +911,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,return -EINVAL ; } - new =u32_init_knode (tp, n); + new =u32_init_knode (net, tp, n);if (!new)return -ENOMEM ;
@@ -1061,7 +1061,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, n->fshift = s->hmask ?ffs (ntohl (s->hmask)) -1 :0 ; n->flags = flags; - err =tcf_exts_init (&n->exts,TCA_U32_ACT ,TCA_U32_POLICE ); + err =tcf_exts_init (&n->exts, net,TCA_U32_ACT ,TCA_U32_POLICE );if (err <0 ) goto errout;
Signature · 1 line
2.20.1
From: Cong Wang <[email protected]>
Date: Wed, 20 Feb 2019 21:37:42 -0800
Quoted 10 lines
For tcindex filter, it is too late to initialize the net pointer in
tcf_exts_validate(), astcf_exts_get_net()requires a non-NULL net pointer. We can just move its initialization intotcf_exts_init(), which just requires an additional parameter.This makes the code in
tcindex_alloc_perfect_hash()prettier.Signed-off-by Cong Wang <[email protected]>
Applied, thanks Cong.