tc: show used HW stats types

If kernel provides the attribute, show the used HW stats types.

Example:

$ tc filter add dev enp3s0np1 ingress proto ip handle 1 pref 1 flower dst_ip 192.168.1.1 action drop
$ tc -s filter show dev enp3s0np1 ingress
filter protocol ip pref 1 flower chain 0
filter protocol ip pref 1 flower chain 0 handle 0x1
  eth_type ipv4
  dst_ip 192.168.1.1
  in_hw in_hw_count 2
        action order 1: gact action drop
         random type none pass val 0
         index 1 ref 1 bind 1 installed 10 sec used 10 sec
        Action statistics:
        Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
        backlog 0b 0p requeues 0
        used_hw_stats immediate     <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/tc/m_action.c b/tc/m_action.c
index 2c4b5df6e05c23bf645b0a503da594e6537668f9..108329db29d0b769b85ff4e2e6153292ee37b573 100644 (file)
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -159,7 +159,7 @@ static const struct hw_stats_item {
        { "disabled", 0 }, /* no bit set */
 };
 
-static void print_hw_stats(const struct rtattr *arg)
+static void print_hw_stats(const struct rtattr *arg, bool print_used)
 {
        struct nla_bitfield32 *hw_stats_bf = RTA_DATA(arg);
        __u8 hw_stats;
@@ -167,7 +167,7 @@ static void print_hw_stats(const struct rtattr *arg)
 
        hw_stats = hw_stats_bf->value & hw_stats_bf->selector;
        print_string(PRINT_FP, NULL, "\t", NULL);
-       open_json_array(PRINT_ANY, "hw_stats");
+       open_json_array(PRINT_ANY, print_used ? "used_hw_stats" : "hw_stats");
 
        for (i = 0; i < ARRAY_SIZE(hw_stats_items); i++) {
                const struct hw_stats_item *item;
@@ -177,6 +177,7 @@ static void print_hw_stats(const struct rtattr *arg)
                        print_string(PRINT_ANY, NULL, " %s", item->str);
        }
        close_json_array(PRINT_JSON, NULL);
+       print_string(PRINT_FP, NULL, "%s", _SL_);
 }
 
 static int parse_hw_stats(const char *str, struct nlmsghdr *n)
@@ -399,7 +400,10 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
                print_string(PRINT_FP, NULL, "%s", _SL_);
        }
        if (tb[TCA_ACT_HW_STATS])
-               print_hw_stats(tb[TCA_ACT_HW_STATS]);
+               print_hw_stats(tb[TCA_ACT_HW_STATS], false);
+
+       if (tb[TCA_ACT_USED_HW_STATS])
+               print_hw_stats(tb[TCA_ACT_USED_HW_STATS], true);
 
        return 0;
 }