iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/sched: act_api: add specific EXT_WARN_MSG for tc action

Browse Source 
In my previous commit 0349b8779cc9 ("sched: add new attr TCA_EXT_WARN_MSG
to report tc extact message") I didn't notice the tc action use different
enum with filter. So we can't use TCA_EXT_WARN_MSG directly for tc action.
Let's add a TCA_ROOT_EXT_WARN_MSG for tc action specifically and put this
param before going to the TCA_ACT_TAB nest.

Fixes: 0349b8779cc9 ("sched: add new attr TCA_EXT_WARN_MSG to report tc extact message")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Hangbin Liu 2023-03-16 11:37:53 +08:00 committed by Jakub Kicinski
parent 8de2bd0243
commit 2f59823fe6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/uapi/linux/rtnetlink.h
View File

@ -789,6 +789,7 @@ enum {
TCA_ROOT_FLAGS, TCA_ROOT_FLAGS,
TCA_ROOT_COUNT, TCA_ROOT_COUNT,
TCA_ROOT_TIME_DELTA, /* in msecs */ TCA_ROOT_TIME_DELTA, /* in msecs */
TCA_ROOT_EXT_WARN_MSG,
__TCA_ROOT_MAX, __TCA_ROOT_MAX,
#define TCA_ROOT_MAX (__TCA_ROOT_MAX - 1) #define TCA_ROOT_MAX (__TCA_ROOT_MAX - 1)
}; };

8
net/sched/act_api.c
View File

@ -1589,6 +1589,10 @@ static int tca_get_fill(struct sk_buff *skb, struct tc_action *actions[],
t->tca__pad1 = 0; t->tca__pad1 = 0;
t->tca__pad2 = 0; t->tca__pad2 = 0;
if (extack && extack->_msg &&
nla_put_string(skb, TCA_ROOT_EXT_WARN_MSG, extack->_msg))
goto out_nlmsg_trim;
nest = nla_nest_start_noflag(skb, TCA_ACT_TAB); nest = nla_nest_start_noflag(skb, TCA_ACT_TAB);
if (!nest) if (!nest)
goto out_nlmsg_trim; goto out_nlmsg_trim;
@ -1598,10 +1602,6 @@ static int tca_get_fill(struct sk_buff *skb, struct tc_action *actions[],
nla_nest_end(skb, nest); nla_nest_end(skb, nest);
if (extack && extack->_msg &&
nla_put_string(skb, TCA_EXT_WARN_MSG, extack->_msg))
goto out_nlmsg_trim;
nlh->nlmsg_len = skb_tail_pointer(skb) - b; nlh->nlmsg_len = skb_tail_pointer(skb) - b;
return skb->len; return skb->len;