net: sched: act: add extack for lookup callback

Alexander Aring · davem330 · commit 331a9295de23 · 2018-02-16T16:05:03.000-05:00
This patch adds extack support for act lookup callback api. This
prepares to handle extack support inside each specific act
implementation.

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
@@ -87,7 +87,8 @@ struct tc_action_ops {
 		       struct tcf_result *);
 	int     (*dump)(struct sk_buff *, struct tc_action *, int, int);
 	void	(*cleanup)(struct tc_action *);
-	int     (*lookup)(struct net *net, struct tc_action **a, u32 index);
+	int     (*lookup)(struct net *net, struct tc_action **a, u32 index,
+			  struct netlink_ext_ack *extack);
 	int     (*init)(struct net *net, struct nlattr *nla,
 			struct nlattr *est, struct tc_action **act, int ovr,
 			int bind, struct netlink_ext_ack *extack);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
@@ -901,7 +901,7 @@ static struct tc_action *tcf_action_get_1(struct net *net, struct nlattr *nla,
 		goto err_out;
 	}
 	err = -ENOENT;
-	if (ops->lookup(net, &a, index) == 0)
+	if (ops->lookup(net, &a, index, extack) == 0)
 		goto err_mod;
 
 	module_put(ops->owner);
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
@@ -374,7 +374,8 @@ static int tcf_bpf_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index,
+			  struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, bpf_net_id);
 
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
@@ -184,7 +184,8 @@ static int tcf_connmark_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_connmark_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_connmark_search(struct net *net, struct tc_action **a, u32 index,
+			       struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, connmark_net_id);
 
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
@@ -638,7 +638,8 @@ static int tcf_csum_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_csum_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_csum_search(struct net *net, struct tc_action **a, u32 index,
+			   struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, csum_net_id);
 
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
@@ -208,7 +208,8 @@ static int tcf_gact_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_gact_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_gact_search(struct net *net, struct tc_action **a, u32 index,
+			   struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, gact_net_id);
 
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
@@ -831,7 +831,8 @@ static int tcf_ife_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_ife_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_ife_search(struct net *net, struct tc_action **a, u32 index,
+			  struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, ife_net_id);
 
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
@@ -310,7 +310,8 @@ static int tcf_ipt_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_ipt_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_ipt_search(struct net *net, struct tc_action **a, u32 index,
+			  struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, ipt_net_id);
 
@@ -358,7 +359,8 @@ static int tcf_xt_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_xt_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_xt_search(struct net *net, struct tc_action **a, u32 index,
+			 struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, xt_net_id);
 
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
@@ -272,7 +272,8 @@ static int tcf_mirred_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_mirred_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_mirred_search(struct net *net, struct tc_action **a, u32 index,
+			     struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, mirred_net_id);
 
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
@@ -285,7 +285,8 @@ static int tcf_nat_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_nat_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_nat_search(struct net *net, struct tc_action **a, u32 index,
+			  struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, nat_net_id);
 
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
@@ -426,7 +426,8 @@ static int tcf_pedit_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_pedit_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_pedit_search(struct net *net, struct tc_action **a, u32 index,
+			    struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, pedit_net_id);
 
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
@@ -305,7 +305,8 @@ static int tcf_act_police_dump(struct sk_buff *skb, struct tc_action *a,
 	return -1;
 }
 
-static int tcf_police_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_police_search(struct net *net, struct tc_action **a, u32 index,
+			     struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, police_net_id);
 
diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
@@ -209,7 +209,8 @@ static int tcf_sample_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_sample_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_sample_search(struct net *net, struct tc_action **a, u32 index,
+			     struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, sample_net_id);
 
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
@@ -177,7 +177,8 @@ static int tcf_simp_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_simp_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_simp_search(struct net *net, struct tc_action **a, u32 index,
+			   struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, simp_net_id);
 
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
@@ -215,7 +215,8 @@ static int tcf_skbedit_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_skbedit_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_skbedit_search(struct net *net, struct tc_action **a, u32 index,
+			      struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, skbedit_net_id);
 
diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
@@ -239,7 +239,8 @@ static int tcf_skbmod_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_skbmod_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_skbmod_search(struct net *net, struct tc_action **a, u32 index,
+			     struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, skbmod_net_id);
 
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
@@ -298,7 +298,8 @@ static int tunnel_key_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tunnel_key_search(struct net *net, struct tc_action **a, u32 index)
+static int tunnel_key_search(struct net *net, struct tc_action **a, u32 index,
+			     struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, tunnel_key_net_id);
 
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
@@ -274,7 +274,8 @@ static int tcf_vlan_walker(struct net *net, struct sk_buff *skb,
 	return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_vlan_search(struct net *net, struct tc_action **a, u32 index)
+static int tcf_vlan_search(struct net *net, struct tc_action **a, u32 index,
+			   struct netlink_ext_ack *extack)
 {
 	struct tc_action_net *tn = net_generic(net, vlan_net_id);
 

Original file line number	Diff line number	Diff line change
`@@ -901,7 +901,7 @@ static struct tc_action tcf_action_get_1(struct net net, struct nlattr *nla,`
`901`	`901`	`goto err_out;`
`902`	`902`	`}`
`903`	`903`	`err = -ENOENT;`
`904`		`- if (ops->lookup(net, &a, index) == 0)`
	`904`	`+ if (ops->lookup(net, &a, index, extack) == 0)`
`905`	`905`	`goto err_mod;`
`906`	`906`
`907`	`907`	`module_put(ops->owner);`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,8 @@ static int tcf_bpf_walker(struct net net, struct sk_buff skb,`
`374`	`374`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`375`	`375`	`}`
`376`	`376`
`377`		`-static int tcf_bpf_search(struct net net, struct tc_action *a, u32 index)`
	`377`	`+static int tcf_bpf_search(struct net net, struct tc_action *a, u32 index,`
	`378`	`+ struct netlink_ext_ack *extack)`
`378`	`379`	`{`
`379`	`380`	`struct tc_action_net *tn = net_generic(net, bpf_net_id);`
`380`	`381`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,8 @@ static int tcf_connmark_walker(struct net net, struct sk_buff skb,`
`184`	`184`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`185`	`185`	`}`
`186`	`186`
`187`		`-static int tcf_connmark_search(struct net net, struct tc_action *a, u32 index)`
	`187`	`+static int tcf_connmark_search(struct net net, struct tc_action *a, u32 index,`
	`188`	`+ struct netlink_ext_ack *extack)`
`188`	`189`	`{`
`189`	`190`	`struct tc_action_net *tn = net_generic(net, connmark_net_id);`
`190`	`191`
Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,8 @@ static int tcf_csum_walker(struct net net, struct sk_buff skb,`
`638`	`638`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`639`	`639`	`}`
`640`	`640`
`641`		`-static int tcf_csum_search(struct net net, struct tc_action *a, u32 index)`
	`641`	`+static int tcf_csum_search(struct net net, struct tc_action *a, u32 index,`
	`642`	`+ struct netlink_ext_ack *extack)`
`642`	`643`	`{`
`643`	`644`	`struct tc_action_net *tn = net_generic(net, csum_net_id);`
`644`	`645`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,8 @@ static int tcf_gact_walker(struct net net, struct sk_buff skb,`
`208`	`208`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`209`	`209`	`}`
`210`	`210`
`211`		`-static int tcf_gact_search(struct net net, struct tc_action *a, u32 index)`
	`211`	`+static int tcf_gact_search(struct net net, struct tc_action *a, u32 index,`
	`212`	`+ struct netlink_ext_ack *extack)`
`212`	`213`	`{`
`213`	`214`	`struct tc_action_net *tn = net_generic(net, gact_net_id);`
`214`	`215`
Original file line number	Diff line number	Diff line change
`@@ -831,7 +831,8 @@ static int tcf_ife_walker(struct net net, struct sk_buff skb,`
`831`	`831`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`832`	`832`	`}`
`833`	`833`
`834`		`-static int tcf_ife_search(struct net net, struct tc_action *a, u32 index)`
	`834`	`+static int tcf_ife_search(struct net net, struct tc_action *a, u32 index,`
	`835`	`+ struct netlink_ext_ack *extack)`
`835`	`836`	`{`
`836`	`837`	`struct tc_action_net *tn = net_generic(net, ife_net_id);`
`837`	`838`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,8 @@ static int tcf_ipt_walker(struct net net, struct sk_buff skb,`
`310`	`310`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`311`	`311`	`}`
`312`	`312`
`313`		`-static int tcf_ipt_search(struct net net, struct tc_action *a, u32 index)`
	`313`	`+static int tcf_ipt_search(struct net net, struct tc_action *a, u32 index,`
	`314`	`+ struct netlink_ext_ack *extack)`
`314`	`315`	`{`
`315`	`316`	`struct tc_action_net *tn = net_generic(net, ipt_net_id);`
`316`	`317`
`@@ -358,7 +359,8 @@ static int tcf_xt_walker(struct net net, struct sk_buff skb,`
`358`	`359`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`359`	`360`	`}`
`360`	`361`
`361`		`-static int tcf_xt_search(struct net net, struct tc_action *a, u32 index)`
	`362`	`+static int tcf_xt_search(struct net net, struct tc_action *a, u32 index,`
	`363`	`+ struct netlink_ext_ack *extack)`
`362`	`364`	`{`
`363`	`365`	`struct tc_action_net *tn = net_generic(net, xt_net_id);`
`364`	`366`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,8 @@ static int tcf_mirred_walker(struct net net, struct sk_buff skb,`
`272`	`272`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`273`	`273`	`}`
`274`	`274`
`275`		`-static int tcf_mirred_search(struct net net, struct tc_action *a, u32 index)`
	`275`	`+static int tcf_mirred_search(struct net net, struct tc_action *a, u32 index,`
	`276`	`+ struct netlink_ext_ack *extack)`
`276`	`277`	`{`
`277`	`278`	`struct tc_action_net *tn = net_generic(net, mirred_net_id);`
`278`	`279`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,8 @@ static int tcf_nat_walker(struct net net, struct sk_buff skb,`
`285`	`285`	`return tcf_generic_walker(tn, skb, cb, type, ops);`
`286`	`286`	`}`
`287`	`287`
`288`		`-static int tcf_nat_search(struct net net, struct tc_action *a, u32 index)`
	`288`	`+static int tcf_nat_search(struct net net, struct tc_action *a, u32 index,`
	`289`	`+ struct netlink_ext_ack *extack)`
`289`	`290`	`{`
`290`	`291`	`struct tc_action_net *tn = net_generic(net, nat_net_id);`
`291`	`292`