[iproute2-next,v2] f_flower: add cfm support

Message ID	20230620201036.539994-1-zahari.doychev@linux.com (mailing list archive)
State	Superseded
Delegated to:	David Ahern
Headers	show Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3BE392AB55 for <netdev@vger.kernel.org>; Tue, 20 Jun 2023 20:10:50 +0000 (UTC) Sender: Zahari Doychev <zahari.doychev@googlemail.com> From: Zahari Doychev <zahari.doychev@linux.com> To: netdev@vger.kernel.org Cc: dsahern@gmail.com, stephen@networkplumber.org, hmehrtens@maxlinear.com, aleksander.lobakin@intel.com, simon.horman@corigine.com, idosch@idosch.org, Zahari Doychev <zdoychev@maxlinear.com> Subject: [PATCH iproute2-next v2] f_flower: add cfm support Date: Tue, 20 Jun 2023 22:10:36 +0200 Message-ID: <20230620201036.539994-1-zahari.doychev@linux.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[iproute2-next,v2] f_flower: add cfm support \| expand [iproute2-next,v2] f_flower: add cfm support

Context	Check	Description
netdev/tree_selection	success	Not a local patch

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index 00933dda..7865f5a9 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -596,6 +596,8 @@ enum { TCA_FLOWER_L2_MISS, /* u8 */ + TCA_FLOWER_KEY_CFM, /* nested */ + __TCA_FLOWER_MAX, }; @@ -704,6 +706,13 @@ enum { TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1), }; +enum { + TCA_FLOWER_KEY_CFM_OPT_UNSPEC, + TCA_FLOWER_KEY_CFM_MD_LEVEL, + TCA_FLOWER_KEY_CFM_OPCODE, + TCA_FLOWER_KEY_CFM_OPT_MAX, +}; + #define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0) /* Range-based match */ /* Match-all classifier */ diff --git a/lib/ll_proto.c b/lib/ll_proto.c index 526e582f..5aacb5b4 100644 --- a/lib/ll_proto.c +++ b/lib/ll_proto.c @@ -78,6 +78,7 @@ __PF(8021AD,802.1ad) __PF(MPLS_UC,mpls_uc) __PF(MPLS_MC,mpls_mc) __PF(TEB,teb) +__PF(CFM,cfm) { 0x8100, "802.1Q" }, { 0x88cc, "LLDP" }, diff --git a/man/man8/tc-flower.8 b/man/man8/tc-flower.8 index cd997450..83245813 100644 --- a/man/man8/tc-flower.8 +++ b/man/man8/tc-flower.8 @@ -102,7 +102,9 @@ flower \- flow based traffic control filter .BR ip_flags .IR IP_FLAGS " | " .B l2_miss -.IR L2_MISS " }" +.IR L2_MISS " | " +.BR cfm +.IR CFM_OPTIONS " }" .ti -8 .IR LSE_LIST " := [ " LSE_LIST " ] " LSE @@ -120,6 +122,13 @@ flower \- flow based traffic control filter .B ttl .IR TTL " }" +.ti -8 +.IR CFM " := " +.B cfm mdl +.IR LEVEL " | " +.B op +.IR OPCODE " + .SH DESCRIPTION The .B flower @@ -496,11 +505,29 @@ fragmented packet. firstfrag can be used to indicate the first fragmented packet. nofirstfrag can be used to indicates subsequent fragmented packets or non-fragmented packets. .TP + .BI l2_miss " L2_MISS" Match on layer 2 miss in the bridge driver's FDB / MDB. \fIL2_MISS\fR may be 0 or 1. When 1, match on packets that encountered a layer 2 miss. When 0, match on packets that were forwarded using an FDB / MDB entry. Note that broadcast packets do not encounter a miss since a lookup is not performed for them. +.TP + +.BI cfm " CFM_OPTIONS" +Match on Connectivity Fault Management (CFM) fields. +.I CFM_OPTIONS +is a list of options that describe the properties of the CFM information +fields to match. +.RS +.TP +.BI mdl " LEVEL " +Match on the Maintenance Domain (MD) level field. +\fILEVEL\fR is an unsigned 3 bit value in decimal format. +.TP +.BI op " OPCODE " +Match on the CFM opcode field. \fIOPCODE\fR is an unsigned 8 bit value in +decimal format. + .SH NOTES As stated above where applicable, matches of a certain layer implicitly depend on the matches of the next lower layer. Precisely, layer one and two matches diff --git a/tc/f_flower.c b/tc/f_flower.c index b9fe6afb..ddc863d5 100644 --- a/tc/f_flower.c +++ b/tc/f_flower.c @@ -96,12 +96,14 @@ static void explain(void) " ct_state MASKED_CT_STATE |\n" " ct_label MASKED_CT_LABEL |\n" " ct_mark MASKED_CT_MARK |\n" - " ct_zone MASKED_CT_ZONE }\n" + " ct_zone MASKED_CT_ZONE |\n" + " cfm CFM }\n" " LSE-LIST := [ LSE-LIST ] LSE\n" " LSE := lse depth DEPTH { label LABEL | tc TC | bos BOS | ttl TTL }\n" " FILTERID := X:Y:Z\n" " MASKED_LLADDR := { LLADDR | LLADDR/MASK | LLADDR/BITS }\n" " MASKED_CT_STATE := combination of {+|-} and flags trk,est,new,rel,rpl,inv\n" + " CFM := { mdl LEVEL | op OPCODE }\n" " ACTION-SPEC := ... look at individual actions\n" "\n" "NOTE: CLASSID, IP-PROTO are parsed as hexadecimal input.\n" @@ -1447,6 +1449,57 @@ static int flower_parse_mpls(int *argc_p, char ***argv_p, struct nlmsghdr *nlh) return 0; } +static int flower_parse_cfm(int *argc_p, char ***argv_p, __be16 eth_type, + struct nlmsghdr *n) +{ + struct rtattr *cfm_attr; + char **argv = *argv_p; + int argc = *argc_p; + int ret; + + if (eth_type != htons(ETH_P_CFM)) { + fprintf(stderr, + "Can't set attribute if ethertype isn't CFM\n"); + return -1; + } + + cfm_attr = addattr_nest(n, MAX_MSG, TCA_FLOWER_KEY_CFM | NLA_F_NESTED); + + while (argc > 0) { + if (!strcmp(*argv, "mdl")) { + __u8 val; + + NEXT_ARG(); + ret = get_u8(&val, *argv, 10); + if (ret < 0) { + fprintf(stderr, "Illegal \"cfm md level\"\n"); + return -1; + } + addattr8(n, MAX_MSG, TCA_FLOWER_KEY_CFM_MD_LEVEL, val); + } else if (!strcmp(*argv, "op")) { + __u8 val; + + NEXT_ARG(); + ret = get_u8(&val, *argv, 10); + if (ret < 0) { + fprintf(stderr, "Illegal \"cfm opcode\"\n"); + return -1; + } + addattr8(n, MAX_MSG, TCA_FLOWER_KEY_CFM_OPCODE, val); + } else { + break; + } + argc--; argv++; + } + + addattr_nest_end(n, cfm_attr); + + *argc_p = argc; + *argv_p = argv; + + return 0; +} + static int flower_parse_opt(struct filter_util *qu, char *handle, int argc, char **argv, struct nlmsghdr *n) { @@ -2065,6 +2118,12 @@ static int flower_parse_opt(struct filter_util *qu, char *handle, return -1; } continue; + } else if (!strcmp(*argv, "cfm")) { + NEXT_ARG(); + ret = flower_parse_cfm(&argc, &argv, eth_type, n); + if (ret < 0) + return -1; + continue; } else { if (strcmp(*argv, "help") != 0) fprintf(stderr, "What is \"%s\"?\n", *argv); @@ -2754,6 +2813,41 @@ static void flower_print_arp_op(const char *name, flower_print_arp_op_to_name); } +static void flower_print_cfm(struct rtattr *attr) +{ + struct rtattr *tb[TCA_FLOWER_KEY_CFM_OPT_MAX + 1]; + struct rtattr *v; + SPRINT_BUF(out); + size_t sz = 0; + + if (!attr || !(attr->rta_type & NLA_F_NESTED)) + return; + + parse_rtattr(tb, TCA_FLOWER_KEY_CFM_OPT_MAX, RTA_DATA(attr), + RTA_PAYLOAD(attr)); + + print_nl(); + print_string(PRINT_FP, NULL, " cfm", NULL); + open_json_object("cfm"); + + v = tb[TCA_FLOWER_KEY_CFM_MD_LEVEL]; + if (v) { + sz += sprintf(out, " mdl %u", rta_getattr_u8(v)); + print_hhu(PRINT_JSON, "mdl", NULL, rta_getattr_u8(v)); + + } + + v = tb[TCA_FLOWER_KEY_CFM_OPCODE]; + if (v) { + sprintf(out + sz, " op %u", rta_getattr_u8(v)); + print_hhu(PRINT_JSON, "op", NULL, rta_getattr_u8(v)); + + } + + close_json_object(); + print_string(PRINT_FP, "cfm", "%s", out); +} + static int flower_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u32 handle) { @@ -3010,6 +3104,8 @@ static int flower_print_opt(struct filter_util *qu, FILE *f, flower_print_ct_label(tb[TCA_FLOWER_KEY_CT_LABELS], tb[TCA_FLOWER_KEY_CT_LABELS_MASK]); + flower_print_cfm(tb[TCA_FLOWER_KEY_CFM]); + close_json_object(); if (tb[TCA_FLOWER_FLAGS]) {

[iproute2-next,v2] f_flower: add cfm support

Checks

Commit Message

Comments

Patch