From patchwork Tue Jul 25 03:50:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ratheesh Kannoth X-Patchwork-Id: 13325657 X-Patchwork-Delegate: dsahern@gmail.com 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 28EB32107 for ; Tue, 25 Jul 2023 03:50:32 +0000 (UTC) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE5A4171E for ; Mon, 24 Jul 2023 20:50:31 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36OJm1Zb003368; Mon, 24 Jul 2023 20:50:28 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=pMP/31roxSYOolphAQuGD07XaS2ibrOFTZVUFh5OxPw=; b=Hd5wXR5s+/XJQAbkVKb58auocotsDF4EZ9/vXCR3SG4aFQlQzIlRkY0/DO8VUKqT8YC7 Ub3QTUIivfbRvEhUjBUmmfKO+bXRcTGZWBoEHhNXeeOONjTkYWxLdxA44+jI9TsvDnUE nszpyeF/m0lPbOq8ODTTMhnsLBwZHWPAinSKqnjdILvI7cJv1H554cNk5WaCoycm9Ns/ JQmphqeNmeEHzqZnrYh53HQQoO7PkSc3sm/gKCxjPwuJLGKdgoLtfdz8WWKJrJVX/5qh 9Z7Nm53eMJYtlA0Ob7zdigwRz0Fy1zkadRnd3xFNhEw5FBriCNO8LOpaBpUaMzztrjdx nw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3s1nrabkq0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 20:50:28 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Mon, 24 Jul 2023 20:50:24 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Mon, 24 Jul 2023 20:50:24 -0700 Received: from marvell-OptiPlex-7090.marvell.com (unknown [10.28.36.165]) by maili.marvell.com (Postfix) with ESMTP id 32F8C3F707E; Mon, 24 Jul 2023 20:50:22 -0700 (PDT) From: Ratheesh Kannoth To: , CC: , Ratheesh Kannoth Subject: [PATCH iproute2-next] tc: Classifier support for SPI field Date: Tue, 25 Jul 2023 09:20:16 +0530 Message-ID: <20230725035016.505386-1-rkannoth@marvell.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: KAzgnfDUtErhfcAxypwABcV-HlS8kaY4 X-Proofpoint-GUID: KAzgnfDUtErhfcAxypwABcV-HlS8kaY4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-25_01,2023-07-24_01,2023-05-22_02 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: dsahern@gmail.com tc flower support for SPI field in ESP and AH packets. Signed-off-by: Ratheesh Kannoth --- include/uapi/linux/pkt_cls.h | 5 +++- tc/f_flower.c | 55 ++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index 7865f5a9..fce639a6 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -594,6 +594,9 @@ enum { TCA_FLOWER_KEY_L2TPV3_SID, /* be32 */ + TCA_FLOWER_KEY_SPI, /* be32 */ + TCA_FLOWER_KEY_SPI_MASK, /* be32 */ + TCA_FLOWER_L2_MISS, /* u8 */ TCA_FLOWER_KEY_CFM, /* nested */ diff --git a/tc/f_flower.c b/tc/f_flower.c index 6da5028a..d31a6fcb 100644 --- a/tc/f_flower.c +++ b/tc/f_flower.c @@ -60,7 +60,7 @@ static void explain(void) " ppp_proto [ ipv4 | ipv6 | mpls_uc | mpls_mc | PPP_PROTO ] |\n" " dst_mac MASKED-LLADDR |\n" " src_mac MASKED-LLADDR |\n" - " ip_proto [tcp | udp | sctp | icmp | icmpv6 | l2tp | IP-PROTO ] |\n" + " ip_proto [tcp | udp | sctp | icmp | icmpv6 | l2tp | esp | ah | IP-PROTO ] |\n" " ip_tos MASKED-IP_TOS |\n" " ip_ttl MASKED-IP_TTL |\n" " mpls LSE-LIST |\n" @@ -68,6 +68,7 @@ static void explain(void) " mpls_tc TC |\n" " mpls_bos BOS |\n" " mpls_ttl TTL |\n" + " spi SPI-INDEX |\n" " l2tpv3_sid LSID |\n" " dst_ip PREFIX |\n" " src_ip PREFIX |\n" @@ -437,6 +438,16 @@ static int flower_parse_ip_proto(char *str, __be16 eth_type, int type, eth_type != htons(ETH_P_IPV6)) goto err; ip_proto = IPPROTO_L2TP; + } else if (!strcmp(str, "esp")) { + if (eth_type != htons(ETH_P_IP) && + eth_type != htons(ETH_P_IPV6)) + goto err; + ip_proto = IPPROTO_ESP; + } else if (!strcmp(str, "ah")) { + if (eth_type != htons(ETH_P_IP) && + eth_type != htons(ETH_P_IPV6)) + goto err; + ip_proto = IPPROTO_AH; } else { ret = get_u8(&ip_proto, str, 16); if (ret) @@ -655,6 +666,29 @@ static int flower_parse_icmp(char *str, __u16 eth_type, __u8 ip_proto, return flower_parse_u8(str, value_type, mask_type, NULL, NULL, n); } +static int flower_parse_spi(char *str, __u8 ip_proto, struct nlmsghdr *n) +{ + __be32 spi; + int ret; + + if (ip_proto != IPPROTO_UDP && ip_proto != IPPROTO_ESP && ip_proto != IPPROTO_AH) { + fprintf(stderr, + "Can't set \"spi\" if ip_proto isn't ESP/UDP/AH\n"); + return -1; + } + + ret = get_be32(&spi, str, 16); + if (ret < 0) { + fprintf(stderr, "Illegal \"spi index\"\n"); + return -1; + } + + addattr32(n, MAX_MSG, TCA_FLOWER_KEY_SPI, spi); + addattr32(n, MAX_MSG, TCA_FLOWER_KEY_SPI_MASK, UINT32_MAX); + + return 0; +} + static int flower_parse_l2tpv3(char *str, __u8 ip_proto, struct nlmsghdr *n) { @@ -1935,6 +1969,11 @@ static int flower_parse_opt(struct filter_util *qu, char *handle, ret = flower_parse_l2tpv3(*argv, ip_proto, n); if (ret < 0) return -1; + } else if (!strcmp(*argv, "spi")) { + NEXT_ARG(); + ret = flower_parse_spi(*argv, ip_proto, n); + if (ret < 0) + return -1; } else if (matches(*argv, "arp_tip") == 0) { NEXT_ARG(); ret = flower_parse_arp_ip_addr(*argv, eth_type, @@ -2256,8 +2295,12 @@ static void flower_print_ip_proto(__u8 *p_ip_proto, sprintf(out, "icmpv6"); else if (ip_proto == IPPROTO_L2TP) sprintf(out, "l2tp"); + else if (ip_proto == IPPROTO_ESP) + sprintf(out, "esp"); + else if (ip_proto == IPPROTO_AH) + sprintf(out, "ah"); else - sprintf(out, "%02x", ip_proto); + sprintf(out, "0x%02x", ip_proto); print_nl(); print_string(PRINT_ANY, "ip_proto", " ip_proto %s", out); @@ -3024,6 +3067,14 @@ static int flower_print_opt(struct filter_util *qu, FILE *f, rta_getattr_be32(attr)); } + if (tb[TCA_FLOWER_KEY_SPI]) { + struct rtattr *attr = tb[TCA_FLOWER_KEY_SPI]; + + print_nl(); + print_hex(PRINT_ANY, "spi", " spi 0x%x", + rta_getattr_be32(attr)); + } + flower_print_ip4_addr("arp_sip", tb[TCA_FLOWER_KEY_ARP_SIP], tb[TCA_FLOWER_KEY_ARP_SIP_MASK]); flower_print_ip4_addr("arp_tip", tb[TCA_FLOWER_KEY_ARP_TIP],