tc: add skip_hw and skip_sw to control action offload

Add skip_hw and skip_sw flags for user to control whether
offload action to hardware.

Also we add hw_count to show how many hardwares accept to offload
the action.

Change man page to describe the usage of skip_sw and skip_hw flag.

An example to add and query action as below.

$ tc actions add action police rate 1mbit burst 100k index 100 skip_sw

$ tc -s -d actions list action police
total acts 1
    action order 0:  police 0x64 rate 1Mbit burst 100Kb mtu 2Kb action reclassify overhead 0b linklayer ethernet
    ref 1 bind 0  installed 2 sec used 2 sec
    Action statistics:
    Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
    backlog 0b 0p requeues 0
    skip_sw in_hw in_hw_count 1
    used_hw_stats delayed

Signed-off-by: baowen zheng <baowen.zheng@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Tested-by: Victor Nogueira <victor@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/man/man8/tc-actions.8 b/man/man8/tc-actions.8
index 6f1c201dfda86effc806c336e046fc6aaadc02bf..5c399cdfb1c2e561d219cb0ef346979433192c3c 100644 (file)
--- a/man/man8/tc-actions.8
+++ b/man/man8/tc-actions.8
@@ -52,6 +52,8 @@ actions \- independently defined actions in tc
 .I HWSTATSSPEC
 ] [
 .I CONTROL
+] [
+.I SKIPSPEC
 ]
 
 .I ACTISPEC
@@ -99,6 +101,11 @@ Time since last update.
 .IR reclassify " | " pipe " | " drop " | " continue " | " ok
 }
 
+.I SKIPSPEC
+:= {
+.IR skip_sw " | " skip_hw
+}
+
 .I TC_OPTIONS
 These are the options that are specific to
 .B tc
@@ -270,6 +277,23 @@ Return to the calling qdisc for packet processing, and end classification of
 this packet.
 .RE
 
+.TP
+.I SKIPSPEC
+The
+.I SKIPSPEC
+indicates how
+.B tc
+should proceed when executing the action. Any of the following are valid:
+.RS
+.TP
+.B skip_sw
+Do not process action by software. If hardware has no offload support for this
+action, operation will fail.
+.TP
+.B skip_hw
+Do not process action by hardware.
+.RE
+
 .SH SEE ALSO
 .BR tc (8),
 .BR tc-bpf (8),

diff --git a/tc/m_action.c b/tc/m_action.c
index ee32aeda98fdbd5b31c8e5629f574ed04c42b14b..1dd5425ce4da09c7549590fc15df55fc66597913 100644 (file)
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -51,9 +51,10 @@ static void act_usage(void)
                "       FL := ls | list | flush | <ACTNAMESPEC>\n"
                "       ACTNAMESPEC :=  action <ACTNAME>\n"
                "       ACTISPEC := <ACTNAMESPEC> <INDEXSPEC>\n"
-               "       ACTSPEC := action <ACTDETAIL> [INDEXSPEC] [HWSTATSSPEC]\n"
+               "       ACTSPEC := action <ACTDETAIL> [INDEXSPEC] [HWSTATSSPEC] [SKIPSPEC]\n"
                "       INDEXSPEC := index <32 bit indexvalue>\n"
                "       HWSTATSSPEC := hw_stats [ immediate | delayed | disabled ]\n"
+               "       SKIPSPEC := [ skip_sw | skip_hw ]\n"
                "       ACTDETAIL := <ACTNAME> <ACTPARAMS>\n"
                "               Example ACTNAME is gact, mirred, bpf, etc\n"
                "               Each action has its own parameters (ACTPARAMS)\n"
@@ -245,6 +246,8 @@ int parse_action(int *argc_p, char ***argv_p, int tca_id, struct nlmsghdr *n)
                        goto done0;
                } else {
                        struct action_util *a = NULL;
+                       int skip_loop = 2;
+                       __u32 flag = 0;
 
                        if (!action_a2n(*argv, NULL, false))
                                strncpy(k, "gact", sizeof(k) - 1);
@@ -314,13 +317,27 @@ done0:
                        }
 
                        if (*argv && strcmp(*argv, "no_percpu") == 0) {
+                               flag |= TCA_ACT_FLAGS_NO_PERCPU_STATS;
+                               NEXT_ARG_FWD();
+                       }
+
+                       /* we need to parse twice to fix skip flag out of order */
+                       while (skip_loop--) {
+                               if (*argv && strcmp(*argv, "skip_sw") == 0) {
+                                       flag |= TCA_ACT_FLAGS_SKIP_SW;
+                                       NEXT_ARG_FWD();
+                               } else if (*argv && strcmp(*argv, "skip_hw") == 0) {
+                                       flag |= TCA_ACT_FLAGS_SKIP_HW;
+                                       NEXT_ARG_FWD();
+                               }
+                       }
+
+                       if (flag) {
                                struct nla_bitfield32 flags =
-                                       { TCA_ACT_FLAGS_NO_PERCPU_STATS,
-                                         TCA_ACT_FLAGS_NO_PERCPU_STATS };
+                                       { flag, flag };
 
                                addattr_l(n, MAX_MSG, TCA_ACT_FLAGS, &flags,
                                          sizeof(struct nla_bitfield32));
-                               NEXT_ARG_FWD();
                        }
 
                        addattr_nest_end(n, tail);
@@ -396,13 +413,39 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
                                           strsz, b1, sizeof(b1)));
                print_nl();
        }
-       if (tb[TCA_ACT_FLAGS]) {
-               struct nla_bitfield32 *flags = RTA_DATA(tb[TCA_ACT_FLAGS]);
+       if (tb[TCA_ACT_FLAGS] || tb[TCA_ACT_IN_HW_COUNT]) {
+               bool skip_hw = false;
+               if (tb[TCA_ACT_FLAGS]) {
+                       struct nla_bitfield32 *flags = RTA_DATA(tb[TCA_ACT_FLAGS]);
+
+                       if (flags->selector & TCA_ACT_FLAGS_NO_PERCPU_STATS)
+                               print_bool(PRINT_ANY, "no_percpu", "\tno_percpu",
+                                          flags->value &
+                                          TCA_ACT_FLAGS_NO_PERCPU_STATS);
+                       if (flags->selector & TCA_ACT_FLAGS_SKIP_HW) {
+                               print_bool(PRINT_ANY, "skip_hw", "\tskip_hw",
+                                          flags->value &
+                                          TCA_ACT_FLAGS_SKIP_HW);
+                               skip_hw = !!(flags->value & TCA_ACT_FLAGS_SKIP_HW);
+                       }
+                       if (flags->selector & TCA_ACT_FLAGS_SKIP_SW)
+                               print_bool(PRINT_ANY, "skip_sw", "\tskip_sw",
+                                          flags->value &
+                                          TCA_ACT_FLAGS_SKIP_SW);
+               }
+               if (tb[TCA_ACT_IN_HW_COUNT] && !skip_hw) {
+                       __u32 count = rta_getattr_u32(tb[TCA_ACT_IN_HW_COUNT]);
+                       if (count) {
+                               print_bool(PRINT_ANY, "in_hw", "\tin_hw",
+                                          true);
+                               print_uint(PRINT_ANY, "in_hw_count",
+                                          " in_hw_count %u", count);
+                       } else {
+                               print_bool(PRINT_ANY, "not_in_hw",
+                                          "\tnot_in_hw", true);
+                       }
+               }
 
-               if (flags->selector & TCA_ACT_FLAGS_NO_PERCPU_STATS)
-                       print_bool(PRINT_ANY, "no_percpu", "\tno_percpu",
-                                  flags->value &
-                                  TCA_ACT_FLAGS_NO_PERCPU_STATS);
                print_nl();
        }
        if (tb[TCA_ACT_HW_STATS])