net: sched: avoid atomic swap in tcf_exts_change

jpirko · davem330 · commit 9b0d4446b569 · 2017-08-04T11:21:24.000-07:00
tcf_exts_change is always called on newly created exts, which are not used
on fastpath. Therefore, simple struct copy is enough.

Signed-off-by: Jiri Pirko &lt;jiri@mellanox.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
@@ -201,8 +201,7 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp,
 		      struct nlattr **tb, struct nlattr *rate_tlv,
 		      struct tcf_exts *exts, bool ovr);
 void tcf_exts_destroy(struct tcf_exts *exts);
-void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
-		     struct tcf_exts *src);
+void tcf_exts_change(struct tcf_exts *dst, struct tcf_exts *src);
 int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts);
 int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts);
 int tcf_exts_get_dev(struct net_device *dev, struct tcf_exts *exts,
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
@@ -883,18 +883,12 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
 }
 EXPORT_SYMBOL(tcf_exts_validate);
 
-void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
-		     struct tcf_exts *src)
+void tcf_exts_change(struct tcf_exts *dst, struct tcf_exts *src)
 {
 #ifdef CONFIG_NET_CLS_ACT
 	struct tcf_exts old = *dst;
 
-	tcf_tree_lock(tp);
-	dst->nr_actions = src->nr_actions;
-	dst->actions = src->actions;
-	dst->type = src->type;
-	tcf_tree_unlock(tp);
-
+	*dst = *src;
 	tcf_exts_destroy(&old);
 #endif
 }
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
@@ -518,7 +518,7 @@ static int rsvp_change(struct net *net, struct sk_buff *in_skb,
 			tcf_bind_filter(tp, &n->res, base);
 		}
 
-		tcf_exts_change(tp, &n->exts, &e);
+		tcf_exts_change(&n->exts, &e);
 		rsvp_replace(tp, n, handle);
 		return 0;
 	}
@@ -591,7 +591,7 @@ static int rsvp_change(struct net *net, struct sk_buff *in_skb,
 			if (f->tunnelhdr == 0)
 				tcf_bind_filter(tp, &f->res, base);
 
-			tcf_exts_change(tp, &f->exts, &e);
+			tcf_exts_change(&f->exts, &e);
 
 			fp = &s->ht[h2];
 			for (nfp = rtnl_dereference(*fp); nfp;
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
@@ -419,9 +419,9 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
 	}
 
 	if (old_r)
-		tcf_exts_change(tp, &r->exts, &e);
+		tcf_exts_change(&r->exts, &e);
 	else
-		tcf_exts_change(tp, &cr.exts, &e);
+		tcf_exts_change(&cr.exts, &e);
 
 	if (old_r && old_r != r) {
 		err = tcindex_filter_result_init(old_r);
@@ -439,7 +439,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
 		struct tcindex_filter *nfp;
 		struct tcindex_filter __rcu **fp;
 
-		tcf_exts_change(tp, &f->result.exts, &r->exts);
+		tcf_exts_change(&f->result.exts, &r->exts);
 
 		fp = cp->h + (handle % cp->hash);
 		for (nfp = rtnl_dereference(*fp);

Original file line number	Diff line number	Diff line change
`@@ -883,18 +883,12 @@ int tcf_exts_validate(struct net net, struct tcf_proto tp, struct nlattr **tb,`
`883`	`883`	`}`
`884`	`884`	`EXPORT_SYMBOL(tcf_exts_validate);`
`885`	`885`
`886`		`-void tcf_exts_change(struct tcf_proto tp, struct tcf_exts dst,`
`887`		`- struct tcf_exts *src)`
	`886`	`+void tcf_exts_change(struct tcf_exts dst, struct tcf_exts src)`
`888`	`887`	`{`
`889`	`888`	`#ifdef CONFIG_NET_CLS_ACT`
`890`	`889`	`struct tcf_exts old = *dst;`
`891`	`890`
`892`		`- tcf_tree_lock(tp);`
`893`		`- dst->nr_actions = src->nr_actions;`
`894`		`- dst->actions = src->actions;`
`895`		`- dst->type = src->type;`
`896`		`- tcf_tree_unlock(tp);`
`897`		`-`
	`891`	`+ dst = src;`
`898`	`892`	`tcf_exts_destroy(&old);`
`899`	`893`	`#endif`
`900`	`894`	`}`
Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ static int rsvp_change(struct net net, struct sk_buff in_skb,`
`518`	`518`	`tcf_bind_filter(tp, &n->res, base);`
`519`	`519`	`}`
`520`	`520`
`521`		`- tcf_exts_change(tp, &n->exts, &e);`
	`521`	`+ tcf_exts_change(&n->exts, &e);`
`522`	`522`	`rsvp_replace(tp, n, handle);`
`523`	`523`	`return 0;`
`524`	`524`	`}`
`@@ -591,7 +591,7 @@ static int rsvp_change(struct net net, struct sk_buff in_skb,`
`591`	`591`	`if (f->tunnelhdr == 0)`
`592`	`592`	`tcf_bind_filter(tp, &f->res, base);`
`593`	`593`
`594`		`- tcf_exts_change(tp, &f->exts, &e);`
	`594`	`+ tcf_exts_change(&f->exts, &e);`
`595`	`595`
`596`	`596`	`fp = &s->ht[h2];`
`597`	`597`	`for (nfp = rtnl_dereference(*fp); nfp;`