diff options
| author |   Baowen Zheng <baowen.zheng@corigine.com> | 2021-12-17 19:16:26 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-12-19 14:08:48 +0000 |
| commit | e8cb5bcf6ed6d42227c453a3a3170105462f69df (patch) | |
| tree | 3b898d7460bee7ad282212f6e994ec0c247ee889 /net/sched | |
| parent | flow_offload: add process to update action stats from hardware (diff) | |
| download | linux-dev-e8cb5bcf6ed6d42227c453a3a3170105462f69df.tar.xz linux-dev-e8cb5bcf6ed6d42227c453a3a3170105462f69df.zip | |
net: sched: save full flags for tc action
Save full action flags and return user flags when return flags to
user space.
Save full action flags to distinguish if the action is created
independent from classifier.
We made this change mainly for further patch to reoffload tc actions.
Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_api.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index f9186f283488..b32680ad75d3 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -669,7 +669,7 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est, p->tcfa_tm.install = jiffies; p->tcfa_tm.lastuse = jiffies; p->tcfa_tm.firstuse = 0; - p->tcfa_flags = flags & TCA_ACT_FLAGS_USER_MASK; + p->tcfa_flags = flags; if (est) { err = gen_new_estimator(&p->tcfa_bstats, p->cpu_bstats, &p->tcfa_rate_est, @@ -996,6 +996,7 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) int err = -EINVAL; unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest; + u32 flags; if (tcf_action_dump_terse(skb, a, false)) goto nla_put_failure; @@ -1010,9 +1011,10 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) a->used_hw_stats, TCA_ACT_HW_STATS_ANY)) goto nla_put_failure; - if (a->tcfa_flags && + flags = a->tcfa_flags & TCA_ACT_FLAGS_USER_MASK; + if (flags && nla_put_bitfield32(skb, TCA_ACT_FLAGS, - a->tcfa_flags, a->tcfa_flags)) + flags, flags)) goto nla_put_failure; if (nla_put_u32(skb, TCA_ACT_IN_HW_COUNT, a->in_hw_count)) |