naccyde / rpms / iproute

Forked from rpms/iproute 9 months ago
Clone
Blob Blame History Raw
From a3d12445422afa12a67a7cd121b7add89f6c7d67 Mon Sep 17 00:00:00 2001
From: Andrea Claudi <aclaudi@redhat.com>
Date: Thu, 16 Apr 2020 12:41:49 +0200
Subject: [PATCH] tc: implement support for action flags

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1770671
Upstream Status: iproute2.git commit fb2e033add073

commit fb2e033add073893dea71bb483353790fe8c5354
Author: Vlad Buslov <vladbu@mellanox.com>
Date:   Wed Oct 30 16:20:40 2019 +0200

    tc: implement support for action flags

    Implement setting and printing of action flags with single available flag
    value "no_percpu" that translates to kernel UAPI TCA_ACT_FLAGS value
    TCA_ACT_FLAGS_NO_PERCPU_STATS. Update man page with information regarding
    usage of action flags.

    Example usage:

     # tc actions add action gact drop no_percpu
     # sudo tc actions list action gact
     total acts 1

            action order 0: gact action drop
             random type none pass val 0
             index 1 ref 1 bind 0
            no_percpu

    Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
    Signed-off-by: David Ahern <dsahern@gmail.com>
---
 man/man8/tc-actions.8 | 14 ++++++++++++++
 tc/m_action.c         | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/man/man8/tc-actions.8 b/man/man8/tc-actions.8
index f46166e3f6859..bee59f7247fae 100644
--- a/man/man8/tc-actions.8
+++ b/man/man8/tc-actions.8
@@ -47,6 +47,8 @@ actions \- independently defined actions in tc
 ] [
 .I COOKIESPEC
 ] [
+.I FLAGS
+] [
 .I CONTROL
 ]
 
@@ -71,6 +73,10 @@ ACTNAME
 :=
 .BI cookie " COOKIE"
 
+.I FLAGS
+:=
+.I no_percpu
+
 .I ACTDETAIL
 :=
 .I ACTNAME ACTPARAMS
@@ -186,6 +192,14 @@ As such, it can be used as a correlating value for maintaining user state.
 The value to be stored is completely arbitrary and does not require a specific
 format. It is stored inside the action structure itself.
 
+.TP
+.I FLAGS
+Action-specific flags. Currently, the only supported flag is
+.I no_percpu
+which indicates that action is expected to have minimal software data-path
+traffic and doesn't need to allocate stat counters with percpu allocator.
+This option is intended to be used by hardware-offloaded actions.
+
 .TP
 .BI since " MSTIME"
 When dumping large number of actions, a millisecond time-filter can be
diff --git a/tc/m_action.c b/tc/m_action.c
index bdc62720879c1..c46aeaafa8ebf 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -249,6 +249,16 @@ done0:
 				addattr_l(n, MAX_MSG, TCA_ACT_COOKIE,
 					  &act_ck, act_ck_len);
 
+			if (*argv && strcmp(*argv, "no_percpu") == 0) {
+				struct nla_bitfield32 flags =
+					{ TCA_ACT_FLAGS_NO_PERCPU_STATS,
+					  TCA_ACT_FLAGS_NO_PERCPU_STATS };
+
+				addattr_l(n, MAX_MSG, TCA_ACT_FLAGS, &flags,
+					  sizeof(struct nla_bitfield32));
+				NEXT_ARG_FWD();
+			}
+
 			addattr_nest_end(n, tail);
 			ok++;
 		}
@@ -317,6 +327,15 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
 					   strsz, b1, sizeof(b1)));
 		print_string(PRINT_FP, NULL, "%s", _SL_);
 	}
+	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);
+		print_string(PRINT_FP, NULL, "%s", _SL_);
+	}
 
 	return 0;
 }
-- 
2.25.4