From 13e1ae7b588c723091f81538bb5834b274f0b0c7 Mon Sep 17 00:00:00 2001

From: Andrea Claudi <aclaudi@redhat.com>

Date: Tue, 18 Jun 2019 20:02:54 +0200

Subject: [PATCH] tc: introduce support for block-handle for filter operations

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1721291

Upstream Status: iproute2.git commit 0c7cef9669a82

Conflicts: context change due to missing commit 485d0c6001c4a

           ("tc: Add batchsize feature for filter and actions"),

           also adjust code to use fprintf instead of print_string

           due to missing commit 249284ff5a44a ("tc: jsonify filter core")

commit 0c7cef9669a82d4ad0438922f7ce57c18100d6b8

Author: Jiri Pirko <jiri@mellanox.com>

Date:   Sat Jan 20 11:00:28 2018 +0100

    tc: introduce support for block-handle for filter operations

    So far, qdisc was the only handle that could be used to manipulate

    filters. Kernel added support for using block to manipulate it. So add

    the support to use block index to manipulate filters. The magic

    TCM_IFINDEX_MAGIC_BLOCK indicates the block index is in use.

    Signed-off-by: Jiri Pirko <jiri@mellanox.com>

    Signed-off-by: David Ahern <dsahern@gmail.com>

---

 man/man8/tc.8  |  18 +++++++++

 tc/tc_filter.c | 102 +++++++++++++++++++++++++++++++++++++++++--------

 2 files changed, 104 insertions(+), 16 deletions(-)

diff --git a/man/man8/tc.8 b/man/man8/tc.8

index a341a8f995f85..c493ccfa7c900 100644

--- a/man/man8/tc.8

+++ b/man/man8/tc.8

@@ -41,6 +41,19 @@ tc \- show / manipulate traffic control settings

 .B flowid

 \fIflow-id\fR

+.B tc

+.RI "[ " OPTIONS " ]"

+.B filter [ add | change | replace | delete | get ] block

+\fIBLOCK_INDEX\fR

+.B [ handle \fIfilter-id\fR ]

+.B protocol

+\fIprotocol\fR

+.B prio

+\fIpriority\fR filtertype

+[ filtertype specific parameters ]

+.B flowid

+\fIflow-id\fR

+

 .B tc

 .RI "[ " OPTIONS " ]"

 .RI "[ " FORMAT " ]"

@@ -58,6 +71,11 @@ tc \- show / manipulate traffic control settings

 .RI "[ " OPTIONS " ]"

 .B filter show dev

 \fIDEV\fR

+.P

+.B tc

+.RI "[ " OPTIONS " ]"

+.B filter show block

+\fIBLOCK_INDEX\fR

 .P

 .ti 8

diff --git a/tc/tc_filter.c b/tc/tc_filter.c

index e479039159df6..5676ed3a74383 100644

--- a/tc/tc_filter.c

+++ b/tc/tc_filter.c

@@ -29,14 +29,17 @@

 static void usage(void)

 {

 	fprintf(stderr,

-		"Usage: tc filter [ add | del | change | replace | show ] dev STRING\n"

-		"Usage: tc filter get dev STRING parent CLASSID protocol PROTO handle FILTERID pref PRIO FILTER_TYPE\n"

+		"Usage: tc filter [ add | del | change | replace | show ] [ dev STRING ]\n"

+		"       tc filter [ add | del | change | replace | show ] [ block BLOCK_INDEX ]\n"

+		"       tc filter get dev STRING parent CLASSID protocol PROTO handle FILTERID pref PRIO FILTER_TYPE\n"

+		"       tc filter get block BLOCK_INDEX protocol PROTO handle FILTERID pref PRIO FILTER_TYPE\n"

 		"       [ pref PRIO ] protocol PROTO [ chain CHAIN_INDEX ]\n"

 		"       [ estimator INTERVAL TIME_CONSTANT ]\n"

 		"       [ root | ingress | egress | parent CLASSID ]\n"

 		"       [ handle FILTERID ] [ [ FILTER_TYPE ] [ help | OPTIONS ] ]\n"

 		"\n"

 		"       tc filter show [ dev STRING ] [ root | ingress | egress | parent CLASSID ]\n"

+		"       tc filter show [ block BLOCK_INDEX ]\n"

 		"Where:\n"

 		"FILTER_TYPE := { rsvp | u32 | bpf | fw | route | etc. }\n"

 		"FILTERID := ... format depends on classifier, see there\n"

@@ -61,6 +64,7 @@ static int tc_filter_modify(int cmd, unsigned int flags, int argc, char **argv)

 	int protocol_set = 0;

 	__u32 chain_index;

 	int chain_index_set = 0;

+	__u32 block_index = 0;

 	char *fhandle = NULL;

 	char  d[16] = {};

 	char  k[16] = {};

@@ -74,7 +78,21 @@ static int tc_filter_modify(int cmd, unsigned int flags, int argc, char **argv)

 			NEXT_ARG();

 			if (d[0])

 				duparg("dev", *argv);

+			if (block_index) {

+				fprintf(stderr, "Error: \"dev\" and \"block\" are mutually exlusive\n");

+				return -1;

+			}

 			strncpy(d, *argv, sizeof(d)-1);

+		} else if (matches(*argv, "block") == 0) {

+			NEXT_ARG();

+			if (block_index)

+				duparg("block", *argv);

+			if (d[0]) {

+				fprintf(stderr, "Error: \"dev\" and \"block\" are mutually exlusive\n");

+				return -1;

+			}

+			if (get_u32(&block_index, *argv, 0) || !block_index)

+				invarg("invalid block index value", *argv);

 		} else if (strcmp(*argv, "root") == 0) {

 			if (req.t.tcm_parent) {

 				fprintf(stderr,

@@ -169,6 +187,9 @@ static int tc_filter_modify(int cmd, unsigned int flags, int argc, char **argv)

 			fprintf(stderr, "Cannot find device \"%s\"\n", d);

 			return 1;

 		}

+	} else if (block_index) {

+		req.t.tcm_ifindex = TCM_IFINDEX_MAGIC_BLOCK;

+		req.t.tcm_block_index = block_index;

 	}

 	if (q) {

@@ -207,6 +228,7 @@ static __u32 filter_prio;

 static __u32 filter_protocol;

 static __u32 filter_chain_index;

 static int filter_chain_index_set;

+static __u32 filter_block_index;

 __u16 f_proto;

 int print_filter(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)

@@ -251,19 +273,25 @@ int print_filter(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)

 		fprintf(fp, "added ");

 	fprintf(fp, "filter ");

-	if (!filter_ifindex || filter_ifindex != t->tcm_ifindex)

-		fprintf(fp, "dev %s ", ll_index_to_name(t->tcm_ifindex));

-

-	if (!filter_parent || filter_parent != t->tcm_parent) {

-		if (t->tcm_parent == TC_H_ROOT)

-			fprintf(fp, "root ");

-		else if (t->tcm_parent == TC_H_MAKE(TC_H_CLSACT, TC_H_MIN_INGRESS))

-			fprintf(fp, "ingress ");

-		else if (t->tcm_parent == TC_H_MAKE(TC_H_CLSACT, TC_H_MIN_EGRESS))

-			fprintf(fp, "egress ");

-		else {

-			print_tc_classid(abuf, sizeof(abuf), t->tcm_parent);

-			fprintf(fp, "parent %s ", abuf);

+	if (t->tcm_ifindex == TCM_IFINDEX_MAGIC_BLOCK) {

+		if (!filter_block_index ||

+		    filter_block_index != t->tcm_block_index)

+			fprintf(fp, "block %u ", t->tcm_block_index);

+	} else {

+		if (!filter_ifindex || filter_ifindex != t->tcm_ifindex)

+			fprintf(fp, "dev %s ", ll_index_to_name(t->tcm_ifindex));

+

+		if (!filter_parent || filter_parent != t->tcm_parent) {

+			if (t->tcm_parent == TC_H_ROOT)

+				fprintf(fp, "root ");

+			else if (t->tcm_parent == TC_H_MAKE(TC_H_CLSACT, TC_H_MIN_INGRESS))

+				fprintf(fp, "ingress ");

+			else if (t->tcm_parent == TC_H_MAKE(TC_H_CLSACT, TC_H_MIN_EGRESS))

+				fprintf(fp, "egress ");

+			else {

+				print_tc_classid(abuf, sizeof(abuf), t->tcm_parent);

+				fprintf(fp, "parent %s ", abuf);

+			}

 		}

 	}

@@ -337,6 +365,7 @@ static int tc_filter_get(int cmd, unsigned int flags, int argc, char **argv)

 	int protocol_set = 0;

 	__u32 chain_index;

 	int chain_index_set = 0;

+	__u32 block_index = 0;

 	__u32 parent_handle = 0;

 	char *fhandle = NULL;

 	char  d[16] = {};

@@ -347,7 +376,21 @@ static int tc_filter_get(int cmd, unsigned int flags, int argc, char **argv)

 			NEXT_ARG();

 			if (d[0])

 				duparg("dev", *argv);

+			if (block_index) {

+				fprintf(stderr, "Error: \"dev\" and \"block\" are mutually exlusive\n");

+				return -1;

+			}

 			strncpy(d, *argv, sizeof(d)-1);

+		} else if (matches(*argv, "block") == 0) {

+			NEXT_ARG();

+			if (block_index)

+				duparg("block", *argv);

+			if (d[0]) {

+				fprintf(stderr, "Error: \"dev\" and \"block\" are mutually exlusive\n");

+				return -1;

+			}

+			if (get_u32(&block_index, *argv, 0) || !block_index)

+				invarg("invalid block index value", *argv);

 		} else if (strcmp(*argv, "root") == 0) {

 			if (req.t.tcm_parent) {

 				fprintf(stderr,

@@ -461,8 +504,12 @@ static int tc_filter_get(int cmd, unsigned int flags, int argc, char **argv)

 			return 1;

 		}

 		filter_ifindex = req.t.tcm_ifindex;

+	} else if (block_index) {

+		req.t.tcm_ifindex = TCM_IFINDEX_MAGIC_BLOCK;

+		req.t.tcm_block_index = block_index;

+		filter_block_index = block_index;

 	} else {

-		fprintf(stderr, "Must specify netdevice \"dev\"\n");

+		fprintf(stderr, "Must specify netdevice \"dev\" or block index \"block\"\n");

 		return -1;

 	}

@@ -510,6 +557,7 @@ static int tc_filter_list(int argc, char **argv)

 	__u32 prio = 0;

 	__u32 protocol = 0;

 	__u32 chain_index;

+	__u32 block_index = 0;

 	char *fhandle = NULL;

 	while (argc > 0) {

@@ -517,7 +565,21 @@ static int tc_filter_list(int argc, char **argv)

 			NEXT_ARG();

 			if (d[0])

 				duparg("dev", *argv);

+			if (block_index) {

+				fprintf(stderr, "Error: \"dev\" cannot be used in the same time as \"block\"\n");

+				return -1;

+			}

 			strncpy(d, *argv, sizeof(d)-1);

+		} else if (matches(*argv, "block") == 0) {

+			NEXT_ARG();

+			if (block_index)

+				duparg("block", *argv);

+			if (d[0]) {

+				fprintf(stderr, "Error: \"block\" cannot be used in the same time as \"dev\"\n");

+				return -1;

+			}

+			if (get_u32(&block_index, *argv, 0) || !block_index)

+				invarg("invalid block index value", *argv);

 		} else if (strcmp(*argv, "root") == 0) {

 			if (req.t.tcm_parent) {

 				fprintf(stderr,

@@ -606,6 +668,14 @@ static int tc_filter_list(int argc, char **argv)

 			return 1;

 		}

 		filter_ifindex = req.t.tcm_ifindex;

+	} else if (block_index) {

+		if (!tc_qdisc_block_exists(block_index)) {

+			fprintf(stderr, "Cannot find block \"%u\"\n", block_index);

+			return 1;

+		}

+		req.t.tcm_ifindex = TCM_IFINDEX_MAGIC_BLOCK;

+		req.t.tcm_block_index = block_index;

+		filter_block_index = block_index;

 	}

 	if (filter_chain_index_set)

-- 

2.20.1