From patchwork Wed Jul 27 18:59:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Lungaroni X-Patchwork-Id: 12930738 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B011C04A68 for ; Wed, 27 Jul 2022 19:14:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236840AbiG0TN7 (ORCPT ); Wed, 27 Jul 2022 15:13:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236838AbiG0TNj (ORCPT ); Wed, 27 Jul 2022 15:13:39 -0400 Received: from smtp.uniroma2.it (smtp.uniroma2.it [160.80.6.16]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D18A71039 for ; Wed, 27 Jul 2022 11:59:31 -0700 (PDT) Received: from localhost.localdomain ([160.80.103.126]) by smtp-2015.uniroma2.it (8.14.4/8.14.4/Debian-8) with ESMTP id 26RIxLtD027965 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 27 Jul 2022 20:59:21 +0200 From: Paolo Lungaroni To: David Ahern , netdev@vger.kernel.org Cc: Jakub Kicinski , Stephen Hemminger , Stefano Salsano , Ahmed Abdelsalam , Andrea Mayer , Anton Makarov , Paolo Lungaroni Subject: [iproute2-next v2] seg6: add support for SRv6 Headend Reduced Encapsulation Date: Wed, 27 Jul 2022 20:59:15 +0200 Message-Id: <20220727185915.29503-1-paolo.lungaroni@uniroma2.it> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.100.0 at smtp-2015 X-Virus-Status: Clean Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com This patch adds the support for the reduced version of the H.Encaps and H.L2Encaps behaviors as defined in RFC 8986 [1]. H.Encaps.Red and H.L2Encaps.Red SRv6 behaviors are an optimization of the H.Encaps and H.L2Encaps aiming to reduce the length of the SID List carried in the pushed SRH. Specifically, the reduced version of the behaviors removes the first SID contained in the SID List (i.e. SRv6 Policy) by storing it into the IPv6 Destination Address. When SRv6 Policy is made of only one SID, the reduced version of the behaviors omits the SRH at all and pushes that SID directly into the IPv6 DA. Some examples: ip -6 route add 2001:db8::1 encap seg6 mode encap.red segs fcf0:1::e,fcf0:2::d6 dev eth0 ip -6 route add 2001:db8::2 encap seg6 mode l2encap.red segs fcf0:1::d2 dev eth0 Standard Output: ip -6 route show 2001:db8::1 2001:db8::1 encap seg6 mode encap.red segs 2 [ fcf0:1::e fcf0:2::d6 ] dev eth0 metric 1024 pref medium JSON Output: ip -6 -j -p route show 2001:db8::1 [ { "dst": "2001:db8::1", "encap": "seg6", "mode": "encap.red", "segs": [ "fcf0:1::e","fcf0:2::d6" ], "dev": "eth0", "metric": 1024, "flags": [ ], "pref": "medium" } ] [1] - https://datatracker.ietf.org/doc/html/rfc8986 Signed-off-by: Paolo Lungaroni --- include/uapi/linux/seg6_iptunnel.h | 2 ++ ip/iproute.c | 2 +- ip/iproute_lwtunnel.c | 2 ++ man/man8/ip-route.8.in | 14 +++++++++++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/seg6_iptunnel.h b/include/uapi/linux/seg6_iptunnel.h index ee6d1dd5..f2e47aad 100644 --- a/include/uapi/linux/seg6_iptunnel.h +++ b/include/uapi/linux/seg6_iptunnel.h @@ -35,6 +35,8 @@ enum { SEG6_IPTUN_MODE_INLINE, SEG6_IPTUN_MODE_ENCAP, SEG6_IPTUN_MODE_L2ENCAP, + SEG6_IPTUN_MODE_ENCAP_RED, + SEG6_IPTUN_MODE_L2ENCAP_RED, }; #endif diff --git a/ip/iproute.c b/ip/iproute.c index 1447a5f7..a1cdf953 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -105,7 +105,7 @@ static void usage(void) "ENCAPTYPE := [ mpls | ip | ip6 | seg6 | seg6local | rpl | ioam6 ]\n" "ENCAPHDR := [ MPLSLABEL | SEG6HDR | SEG6LOCAL | IOAM6HDR ]\n" "SEG6HDR := [ mode SEGMODE ] segs ADDR1,ADDRi,ADDRn [hmac HMACKEYID] [cleanup]\n" - "SEGMODE := [ encap | inline ]\n" + "SEGMODE := [ encap | encap.red | inline | l2encap | l2encap.red ]\n" "SEG6LOCAL := action ACTION [ OPTIONS ] [ count ]\n" "ACTION := { End | End.X | End.T | End.DX2 | End.DX6 | End.DX4 |\n" " End.DT6 | End.DT4 | End.DT46 | End.B6 | End.B6.Encaps |\n" diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c index f4192229..8ffca4f9 100644 --- a/ip/iproute_lwtunnel.c +++ b/ip/iproute_lwtunnel.c @@ -135,6 +135,8 @@ static const char *seg6_mode_types[] = { [SEG6_IPTUN_MODE_INLINE] = "inline", [SEG6_IPTUN_MODE_ENCAP] = "encap", [SEG6_IPTUN_MODE_L2ENCAP] = "l2encap", + [SEG6_IPTUN_MODE_ENCAP_RED] = "encap.red", + [SEG6_IPTUN_MODE_L2ENCAP_RED] = "l2encap.red", }; static const char *format_seg6mode_type(int mode) diff --git a/man/man8/ip-route.8.in b/man/man8/ip-route.8.in index 462ff269..7fad2697 100644 --- a/man/man8/ip-route.8.in +++ b/man/man8/ip-route.8.in @@ -229,7 +229,7 @@ throw " | " unreachable " | " prohibit " | " blackhole " | " nat " ]" .IR ENCAP_SEG6 " := " .B seg6 .BR mode " [ " -.BR encap " | " inline " | " l2encap " ] " +.BR encap " | " encap.red " | " inline " | " l2encap " | " l2encap.red " ] " .B segs .IR SEGMENTS " [ " .B hmac @@ -807,10 +807,22 @@ is a set of encapsulation attributes specific to the - Encapsulate packet in an outer IPv6 header with SRH .sp +.B mode encap.red +- Encapsulate packet in an outer IPv6 header with SRH applying the +reduced segment list. When there is only one segment and the HMAC is +not present, the SRH is omitted. +.sp + .B mode l2encap - Encapsulate ingress L2 frame within an outer IPv6 header and SRH .sp +.B mode l2encap.red +- Encapsulate ingress L2 frame within an outer IPv6 header and SRH +applying the reduced segment list. When there is only one segment +and the HMAC is not present, the SRH is omitted. +.sp + .I SEGMENTS - List of comma-separated IPv6 addresses .sp