net: sched: act: handle extack in tcf_generic_walker

Alexander Aring · davem330 · commit b36201455aa0 · 2018-02-16T16:05:50.000-05:00
This patch adds extack handling for a common used TC act function
"tcf_generic_walker()" to add an extack message on failures.
The tcf_generic_walker() function can fail if get a invalid command
different than DEL and GET. The naming "action" here is wrong, the
correct naming would be command.

Cc: David Ahern &lt;dsahern@gmail.com&gt;
Signed-off-by: Alexander Aring &lt;aring@mojatatu.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/act_api.h b/include/net/act_api.h
@@ -140,7 +140,8 @@ static inline void tc_action_net_exit(struct list_head *net_list,
 
 int tcf_generic_walker(struct tc_action_net *tn, struct sk_buff *skb,
 		       struct netlink_callback *cb, int type,
-		       const struct tc_action_ops *ops);
+		       const struct tc_action_ops *ops,
+		       struct netlink_ext_ack *extack);
 int tcf_idr_search(struct tc_action_net *tn, struct tc_action **a, u32 index);
 bool tcf_idr_check(struct tc_action_net *tn, u32 index, struct tc_action **a,
 		    int bind);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
@@ -202,7 +202,8 @@ static int tcf_del_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
 
 int tcf_generic_walker(struct tc_action_net *tn, struct sk_buff *skb,
 		       struct netlink_callback *cb, int type,
-		       const struct tc_action_ops *ops)
+		       const struct tc_action_ops *ops,
+		       struct netlink_ext_ack *extack)
 {
 	struct tcf_idrinfo *idrinfo = tn->idrinfo;
 
@@ -211,7 +212,8 @@ int tcf_generic_walker(struct tc_action_net *tn, struct sk_buff *skb,
 	} else if (type == RTM_GETACTION) {
 		return tcf_dump_walker(idrinfo, skb, cb);
 	} else {
-		WARN(1, "tcf_generic_walker: unknown action %d\n", type);
+		WARN(1, "tcf_generic_walker: unknown command %d\n", type);
+		NL_SET_ERR_MSG(extack, "tcf_generic_walker: unknown command");
 		return -EINVAL;
 	}
 }
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
@@ -372,7 +372,7 @@ static int tcf_bpf_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, bpf_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
@@ -182,7 +182,7 @@ static int tcf_connmark_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, connmark_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_connmark_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
@@ -636,7 +636,7 @@ static int tcf_csum_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, csum_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_csum_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
@@ -206,7 +206,7 @@ static int tcf_gact_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, gact_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_gact_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
@@ -829,7 +829,7 @@ static int tcf_ife_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, ife_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_ife_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
@@ -308,7 +308,7 @@ static int tcf_ipt_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, ipt_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_ipt_search(struct net *net, struct tc_action **a, u32 index,
@@ -358,7 +358,7 @@ static int tcf_xt_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, xt_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_xt_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
@@ -270,7 +270,7 @@ static int tcf_mirred_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, mirred_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_mirred_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
@@ -283,7 +283,7 @@ static int tcf_nat_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, nat_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_nat_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
@@ -424,7 +424,7 @@ static int tcf_pedit_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, pedit_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_pedit_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
@@ -63,7 +63,7 @@ static int tcf_act_police_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, police_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static const struct nla_policy police_policy[TCA_POLICE_MAX + 1] = {
diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
@@ -207,7 +207,7 @@ static int tcf_sample_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, sample_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_sample_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
@@ -175,7 +175,7 @@ static int tcf_simp_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, simp_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_simp_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
@@ -213,7 +213,7 @@ static int tcf_skbedit_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, skbedit_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_skbedit_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
@@ -237,7 +237,7 @@ static int tcf_skbmod_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, skbmod_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_skbmod_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
@@ -296,7 +296,7 @@ static int tunnel_key_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, tunnel_key_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tunnel_key_search(struct net *net, struct tc_action **a, u32 index,
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
@@ -272,7 +272,7 @@ static int tcf_vlan_walker(struct net *net, struct sk_buff *skb,
 {
 	struct tc_action_net *tn = net_generic(net, vlan_net_id);
 
-	return tcf_generic_walker(tn, skb, cb, type, ops);
+	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_vlan_search(struct net *net, struct tc_action **a, u32 index,

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,8 @@ static int tcf_del_walker(struct tcf_idrinfo idrinfo, struct sk_buff skb,`
`202`	`202`
`203`	`203`	`int tcf_generic_walker(struct tc_action_net tn, struct sk_buff skb,`
`204`	`204`	`struct netlink_callback *cb, int type,`
`205`		`- const struct tc_action_ops *ops)`
	`205`	`+ const struct tc_action_ops *ops,`
	`206`	`+ struct netlink_ext_ack *extack)`
`206`	`207`	`{`
`207`	`208`	`struct tcf_idrinfo *idrinfo = tn->idrinfo;`
`208`	`209`
`@@ -211,7 +212,8 @@ int tcf_generic_walker(struct tc_action_net tn, struct sk_buff skb,`
`211`	`212`	`} else if (type == RTM_GETACTION) {`
`212`	`213`	`return tcf_dump_walker(idrinfo, skb, cb);`
`213`	`214`	`} else {`
`214`		`- WARN(1, "tcf_generic_walker: unknown action %d\n", type);`
	`215`	`+ WARN(1, "tcf_generic_walker: unknown command %d\n", type);`
	`216`	`+ NL_SET_ERR_MSG(extack, "tcf_generic_walker: unknown command");`
`215`	`217`	`return -EINVAL;`
`216`	`218`	`}`
`217`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ static int tcf_bpf_walker(struct net net, struct sk_buff skb,`
`372`	`372`	`{`
`373`	`373`	`struct tc_action_net *tn = net_generic(net, bpf_net_id);`
`374`	`374`
`375`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`375`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`static int tcf_bpf_search(struct net net, struct tc_action *a, u32 index,`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ static int tcf_connmark_walker(struct net net, struct sk_buff skb,`
`182`	`182`	`{`
`183`	`183`	`struct tc_action_net *tn = net_generic(net, connmark_net_id);`
`184`	`184`
`185`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`185`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`static int tcf_connmark_search(struct net net, struct tc_action *a, u32 index,`
Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ static int tcf_csum_walker(struct net net, struct sk_buff skb,`
`636`	`636`	`{`
`637`	`637`	`struct tc_action_net *tn = net_generic(net, csum_net_id);`
`638`	`638`
`639`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`639`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`640`	`640`	`}`
`641`	`641`
`642`	`642`	`static int tcf_csum_search(struct net net, struct tc_action *a, u32 index,`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ static int tcf_gact_walker(struct net net, struct sk_buff skb,`
`206`	`206`	`{`
`207`	`207`	`struct tc_action_net *tn = net_generic(net, gact_net_id);`
`208`	`208`
`209`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`209`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`static int tcf_gact_search(struct net net, struct tc_action *a, u32 index,`
Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,7 @@ static int tcf_ife_walker(struct net net, struct sk_buff skb,`
`829`	`829`	`{`
`830`	`830`	`struct tc_action_net *tn = net_generic(net, ife_net_id);`
`831`	`831`
`832`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`832`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`833`	`833`	`}`
`834`	`834`
`835`	`835`	`static int tcf_ife_search(struct net net, struct tc_action *a, u32 index,`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ static int tcf_ipt_walker(struct net net, struct sk_buff skb,`
`308`	`308`	`{`
`309`	`309`	`struct tc_action_net *tn = net_generic(net, ipt_net_id);`
`310`	`310`
`311`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`311`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`static int tcf_ipt_search(struct net net, struct tc_action *a, u32 index,`
`@@ -358,7 +358,7 @@ static int tcf_xt_walker(struct net net, struct sk_buff skb,`
`358`	`358`	`{`
`359`	`359`	`struct tc_action_net *tn = net_generic(net, xt_net_id);`
`360`	`360`
`361`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`361`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`static int tcf_xt_search(struct net net, struct tc_action *a, u32 index,`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ static int tcf_mirred_walker(struct net net, struct sk_buff skb,`
`270`	`270`	`{`
`271`	`271`	`struct tc_action_net *tn = net_generic(net, mirred_net_id);`
`272`	`272`
`273`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`273`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`static int tcf_mirred_search(struct net net, struct tc_action *a, u32 index,`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ static int tcf_nat_walker(struct net net, struct sk_buff skb,`
`283`	`283`	`{`
`284`	`284`	`struct tc_action_net *tn = net_generic(net, nat_net_id);`
`285`	`285`
`286`		`- return tcf_generic_walker(tn, skb, cb, type, ops);`
	`286`	`+ return tcf_generic_walker(tn, skb, cb, type, ops, extack);`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`static int tcf_nat_search(struct net net, struct tc_action *a, u32 index,`