Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3620145 authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

net: sched: act: handle extack in tcf_generic_walker 



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 <dsahern@gmail.com>
Signed-off-by: default avatarAlexander Aring <aring@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41780105

include/net/act_api.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

net/sched/act_api.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

	}

}

net/sched/act_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

net/sched/act_connmark.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

net/sched/act_csum.c

+1 −1
Original line number Diff line number Diff line
@@ -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,