From patchwork Tue May 9 09:37:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 1778845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=yahoo-corp.jp header.i=@yahoo-corp.jp header.a=rsa-sha256 header.s=selector1 header.b=WKxxaaXG; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QFtQS5fVSz214c for ; Tue, 9 May 2023 19:38:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F1C6383CD5; Tue, 9 May 2023 09:38:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org F1C6383CD5 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key, unprotected) header.d=yahoo-corp.jp header.i=@yahoo-corp.jp header.a=rsa-sha256 header.s=selector1 header.b=WKxxaaXG X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id keJvJ_-n5d29; Tue, 9 May 2023 09:38:52 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 842D881FB0; Tue, 9 May 2023 09:38:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 842D881FB0 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6B15CC008C; Tue, 9 May 2023 09:38:49 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 42362C0036 for ; Tue, 9 May 2023 09:38:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F258281FC6 for ; Tue, 9 May 2023 09:38:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org F258281FC6 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1rUVXAl2FbAj for ; Tue, 9 May 2023 09:38:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6DA0381FB0 Received: from corp-ob09.yahoo-corp.jp (corp-ob09.yahoo-corp.jp [182.22.125.216]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6DA0381FB0 for ; Tue, 9 May 2023 09:38:45 +0000 (UTC) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01lp2105.outbound.protection.outlook.com [104.47.23.105]) by corp-ob09.yahoo-corp.jp (Postfix) with ESMTPS id 95CFF19FB181 for ; Tue, 9 May 2023 18:38:43 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mh9ueDOuzDMATJuYeyDrtlXb3dVkQi6mt2G98jjMWlv+pi2CjdU1jOqUjlBagxxVVei/IUqoYyYhfOkUlW42QvMMGe0jziSmA6dECD7UOSY1cfje14BrfLOIyGILbTWf0p4uueR08x080LqhTAxWuXX+uOC8aGD4wbGGb5MuC2e+rv83XpjaCmELAGWnfbaXSrhhHg3hTl3mj1/27ahDHaXhtFST+Jt9TW5oynz0fsMlpL5Mh7j56w1G3i5Ql5PkQXcngxeUl5QuaGULoJSHVhxtpooUmv82LjLGDCDrW9Tq4Psc6n8GxcKsXOZ4/aa//wUlrLoFCuXGEASiXkKYBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7RWlKZzLJydz0L/XJdNzL8cxkJRR5WS7JPJ7/QhE4Uc=; b=hmBdQQu2eu2sidwFQGQv/JxuJQYyRKUWY+kcIaVZPN85abFKB0G+Hleezjldrywfic/zO4J8Z9ydkXaFhDCNupc5pkW60GBmjS0DwpU74XgLwAZ3VgN+VqnXUyYLGrvoR5ch/+/jfGhG3mwgRFCrCkGtLWWRgtuLezj+R7ym0sM8KhqL4+UR9F3pLLTsUzHUO941lAcRkVC1gU/OzpPrDKVTUieZw+v16c9w822wla8HeSFu2PAEzuElquL3XEDeUFGtLgwQCAZwcuIU8y64BA9nvqYxKBg+B/Np4Cc/mpNOwEBgIVcqnd+TzIKIcXGw4LdxHWFMCxTCYK6PZ7Ydxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=yahoo-corp.jp; dmarc=pass action=none header.from=yahoo-corp.jp; dkim=pass header.d=yahoo-corp.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo-corp.jp; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7RWlKZzLJydz0L/XJdNzL8cxkJRR5WS7JPJ7/QhE4Uc=; b=WKxxaaXG+nPBpKkovseHZWOVud+aS8PyIwcZspnW5LHaR3ps293sorWpFAo4SssQN8mUT7pOwdYZrnSbiYvA+UkwJ/ot/nHftsoXhlqziHBUAjm/hQm56xdNDEjBHqMw7iQGddm4sXrTVj0dda9wd9JXzHVqpbK6GKqLmCDkOS8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=yahoo-corp.jp; Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) by TYCPR01MB10495.jpnprd01.prod.outlook.com (2603:1096:400:307::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.33; Tue, 9 May 2023 09:38:37 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::316c:fe30:7d04:4f2b]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::316c:fe30:7d04:4f2b%5]) with mapi id 15.20.6363.033; Tue, 9 May 2023 09:38:37 +0000 From: Nobuhiro MIKI To: dev@openvswitch.org Date: Tue, 9 May 2023 18:37:59 +0900 Message-Id: <20230509093800.33596-2-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230509093800.33596-1-nmiki@yahoo-corp.jp> References: <20230509093800.33596-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYAPR01CA0013.jpnprd01.prod.outlook.com (2603:1096:404::25) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|TYCPR01MB10495:EE_ X-MS-Office365-Filtering-Correlation-Id: a639903e-5469-4558-f935-08db50712a6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lc3ZybUlHuMSZ3hL+klIB2R1tucKgV9L73+TwZCGQYpbTgCFZ3evJXu45/agwSjL+WOE98358s/WwWY/hkdwjtB005iDdhcHVVIz00qIUhY2efMZYo1XVTG1O00flR7cgLEuZfMxDUT6NhfX6Fw0OTmmtxqWXtboFa5IOtfXAOVPqY22TeG/ph+XzIJ4aChOPlswj3Xhd/YgWgZXBBHbc+Al1udbERUhAZwDssQ+0DjrsedeNEWhHheukNj3yp2lb70nDo4gZe5GWZ99tvbtMJSO52h3yTYXpuugNjKRVdgbIhKvSpOz+aizfLENt4sbqiRAezsIovY8KOAMHK/IKZngzcl1RD1ZoFyddD3YrNUKcDQLahZHMA8/U/j2toLAA/mPBDEDD8RqStMFW1aK4xrNASt4LcRy6Glk9MRUHUexPBgd5tVRSrX5oDyyj1ntAW3OcdO04ILMaTqGoyg4Q92Sd1ti6QeZ6Aa3GGIZl67dJtef6XdEpgbzekTRLx69Jvze+W4gdonHTvy5Byq2JPp64xtASBdeHveZYEGBdZxwrRfiyHpNd9IyfTBevpP5OUCSe1tMdCqhf6jENgssS6R7ByS5InccoMZMbpUxwLqPLjMT+GR/Bbj3T/T2y3d04ZS8Vf2NEylFMf+Zc6G0ug== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB4107.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(376002)(136003)(39860400002)(396003)(366004)(346002)(451199021)(4326008)(52116002)(86362001)(316002)(66556008)(66476007)(6486002)(6666004)(66946007)(41300700001)(6916009)(8676002)(8936002)(5660300002)(478600001)(107886003)(36756003)(6512007)(26005)(6506007)(1076003)(2906002)(186003)(38350700002)(82960400001)(38100700002)(2616005)(83380400001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L0MPjuRdtuSP4HnLs2R2uM/pJVMFJw4ZDg4vppHepTjjetOmY/QhvNV0i2x+oymvju/SrZGRv78C1q452V2yNeHWIYgpdWVloQpYdKZx9PmUel+KRvqO7uZUOa7FAFQsQr0c/WZHCkiWwVyOj7Dj5FM06eFvaCP8la5FgAjMoPl1Iyh0kNq3fzCP7gSUaWuAS6zOwNyvXB2fzoFwo9MAmubkdeQYoi6lVRwnNvqBQ/+68AJuSXNdOZcgkM0vYrbxazZy6BN3u2iP3wrNwmpmNOPfiGehMfBrvRJOZc+tcAzPXPkavuRe7v7oIWy17cahNotZSReav8lAH/6SW9GpfUTFDrjPCMMxkMHKzry6TOWyqmUXNffgoh0XSDf5kNt9Kj9ohI7PisKUVeFOrt8oddfOnexGdd0m4WWlGSQP0sysozD3HfjvBKmIB3NIo78iadxM1/IcX5FEIoqBWoRxMX/EDMMChaLt0zyzuHTD2imYhBstbjKS6hup2A/IVGYK6Yt+2znLhL50pnqL/n+YLU277fjfe/nyN11bKeeux8OUmfqDsuPsGuSgXAP+5UUjdsjpnW/ttaatUoJOmMrMPK4nxImYrhHQgkM3pPKAggllnB/H/QuukwuDWrVa+KB5AZ7ZSejLnBk9l1OGVx5j9+xMi7sMh5JJnyfhAz5nBlpuHCVALHieM18cUar0N3KtOlgoxt0SXhe1QsIYOEfhhmyif8HrqwED8YgjN00fbIzfauIp0VkTtGmL33ucopdA8/+gepHHl1aYgKURE9/rXY0isAmwIsGYnkWFcG8a10cJVvCl/knPoxZ0PL8dLOghNoM8gPbWKMmDa5blUK5jcYAYfPAKxnvZD96THGkW6wQP9XZgRtKqw+eTC1AtzNa2Ry56k0YCyUfxtZ5Zux2Qw7LHxM9Dm3oTkiW37HnJY61Hn0wqURifyFOTzR44BbEs+SzDfgyCnQ567Eucy3wmQ4vuT9dsToFyYAgWJLQ0dwVijClfu0n2PRO3seHWh2hINPHS1GQLgW5jhqmmL2UwoszSYQcOt2iMKKRy49iVxcQv85jgxo/XdgBFa2d2bAeruhaw24xX8HZJwjceR3lf7GIhJIKhTYpMY6ZnxQWbzaABRkbWsaH0r2FKAAd95sYUeS8Wre90LNu8jAoBci0s1jFuIfG/fCbPu5pJWlmfYlBGBQ0k2gm+5VrRxhLkg4kuTFpfxu9C4BR/An8U1z86VA6ul7371VF+41x9YklJ393lyjyn6qTk+OTwkkFzt4BiFucjNl0heEmBadWidbMzKOTQRDGiTy4uvGYLoNh9jW0ChsUols+EsvZ0Jqg3pVixTvvZQ3s0TkJkSCwhywCqalMYMz2J+69xFlvdne6ZZJtf6OTxg2IBojWEJ6Evx5OEnfuXMZahYiqL/adHy+YAbaPexTZoZFdJtDMuIrhPLYCTD6xuC8wuGh+J2XDykyRfPyNPE6keAz6r2OE0vOswqOlsMiSKKKe1kZ2n1y6wjoTjpdysz/F0J+KftnCYxOL340Hv0KeBUXMu8tIdtsXz+77ZGcla3DHlvcLypry5O+Z6A0m6MPnbSSqJGvjX6EMJ X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: a639903e-5469-4558-f935-08db50712a6b X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2023 09:38:37.8593 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wRC0eZIa83ZRLnBRs7KJUN5dWGFLuh3P9m9uh0gu+xv3OT6fRlXgn7YmJh4metH6lf4ykKOw7V0SlqXHRmj7EA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10495 Subject: [ovs-dev] [PATCH v3 1/2] netdev-native-tnl: Add ipv6_label param in netdev_tnl_ip_build_header. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" For tunnels such as SRv6, some popular vendor appliances support IPv6 flowlabel based load balancing. In preparation for OVS to support it, this patch modifies the encapsulation to allow IPv6 flowlabel to be configured. Signed-off-by: Nobuhiro MIKI --- lib/netdev-native-tnl.c | 14 ++++++++------ lib/netdev-native-tnl.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index 9abdf51076a8..55e1bd567fa1 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -35,6 +35,7 @@ #include "byte-order.h" #include "csum.h" #include "dp-packet.h" +#include "flow.h" #include "netdev.h" #include "netdev-vport.h" #include "netdev-vport-private.h" @@ -276,7 +277,7 @@ eth_build_header(struct ovs_action_push_tnl *data, void * netdev_tnl_ip_build_header(struct ovs_action_push_tnl *data, const struct netdev_tnl_build_header_params *params, - uint8_t next_proto) + uint8_t next_proto, uint32_t ipv6_label) { void *l3; @@ -308,7 +309,8 @@ netdev_tnl_ip_build_header(struct ovs_action_push_tnl *data, ip6 = (struct ovs_16aligned_ip6_hdr *) l3; put_16aligned_be32(&ip6->ip6_flow, htonl(6 << 28) | - htonl(params->flow->tunnel.ip_tos << 20)); + htonl(params->flow->tunnel.ip_tos << 20) | + htonl(ipv6_label & 0xfffff)); ip6->ip6_hlim = params->flow->tunnel.ip_ttl; ip6->ip6_nxt = next_proto; memcpy(&ip6->ip6_src, params->s_ip, sizeof(ovs_be32[4])); @@ -326,7 +328,7 @@ udp_build_header(struct netdev_tunnel_config *tnl_cfg, { struct udp_header *udp; - udp = netdev_tnl_ip_build_header(data, params, IPPROTO_UDP); + udp = netdev_tnl_ip_build_header(data, params, IPPROTO_UDP, 0); udp->udp_dst = tnl_cfg->dst_port; if (params->is_ipv6 || params->flow->tunnel.flags & FLOW_TNL_F_CSUM) { @@ -488,7 +490,7 @@ netdev_gre_build_header(const struct netdev *netdev, ovs_mutex_lock(&dev->mutex); tnl_cfg = &dev->tnl_cfg; - greh = netdev_tnl_ip_build_header(data, params, IPPROTO_GRE); + greh = netdev_tnl_ip_build_header(data, params, IPPROTO_GRE, 0); if (params->flow->packet_type == htonl(PT_ETH)) { greh->protocol = htons(ETH_TYPE_TEB); @@ -644,7 +646,7 @@ netdev_erspan_build_header(const struct netdev *netdev, /* XXX: RCUfy tnl_cfg. */ ovs_mutex_lock(&dev->mutex); tnl_cfg = &dev->tnl_cfg; - greh = netdev_tnl_ip_build_header(data, params, IPPROTO_GRE); + greh = netdev_tnl_ip_build_header(data, params, IPPROTO_GRE, 0); ersh = ERSPAN_HDR(greh); tun_id = ntohl(be64_to_be32(params->flow->tunnel.tun_id)); @@ -880,7 +882,7 @@ netdev_srv6_build_header(const struct netdev *netdev, goto out; } - srh = netdev_tnl_ip_build_header(data, params, IPPROTO_ROUTING); + srh = netdev_tnl_ip_build_header(data, params, IPPROTO_ROUTING, 0); srh->rt_hdr.segments_left = nr_segs - 1; srh->rt_hdr.type = IPV6_SRCRT_TYPE_4; srh->rt_hdr.hdrlen = 2 * nr_segs; diff --git a/lib/netdev-native-tnl.h b/lib/netdev-native-tnl.h index 4dad8f978cc6..b06e7bbf2a72 100644 --- a/lib/netdev-native-tnl.h +++ b/lib/netdev-native-tnl.h @@ -118,7 +118,7 @@ netdev_tnl_ipv6_hdr(void *eth) void * netdev_tnl_ip_build_header(struct ovs_action_push_tnl *data, const struct netdev_tnl_build_header_params *params, - uint8_t next_proto); + uint8_t next_proto, uint32_t ipv6_label); extern uint16_t tnl_udp_port_min; extern uint16_t tnl_udp_port_max; From patchwork Tue May 9 09:38:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 1778846 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=yahoo-corp.jp header.i=@yahoo-corp.jp header.a=rsa-sha256 header.s=selector1 header.b=GVR7r0Qy; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QFtQT624Jz214f for ; Tue, 9 May 2023 19:38:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A5FFE614D2; Tue, 9 May 2023 09:38:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A5FFE614D2 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key, unprotected) header.d=yahoo-corp.jp header.i=@yahoo-corp.jp header.a=rsa-sha256 header.s=selector1 header.b=GVR7r0Qy X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MjBZGx4tU7Pv; Tue, 9 May 2023 09:38:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id E97AD6FFBB; Tue, 9 May 2023 09:38:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E97AD6FFBB Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 158EBC0092; Tue, 9 May 2023 09:38:50 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id EA331C008A for ; Tue, 9 May 2023 09:38:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9BE0E81FB0 for ; Tue, 9 May 2023 09:38:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9BE0E81FB0 Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=yahoo-corp.jp header.i=@yahoo-corp.jp header.a=rsa-sha256 header.s=selector1 header.b=GVR7r0Qy X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kxYZDLPxKxIk for ; Tue, 9 May 2023 09:38:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0131481FB5 Received: from corp-ob10.yahoo-corp.jp (corp-ob10.yahoo-corp.jp [182.22.125.210]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0131481FB5 for ; Tue, 9 May 2023 09:38:45 +0000 (UTC) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01lp2105.outbound.protection.outlook.com [104.47.23.105]) by corp-ob10.yahoo-corp.jp (Postfix) with ESMTPS id CBE4D19FB180 for ; Tue, 9 May 2023 18:38:43 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AKnZCY0JsEj2kBxQyIk2GCyNEJZnuqSoLXC4PzelT5k80gxopw4Ex56eiCHvZ33+wUya9sf/ajOV3tR2jR5omKOu57iaOfh6VguCZxdXzNZwlKjFo4Y215U57wXnKIrmlEKXp08m5vxsAo0kUVhVi0LaXqZkX6B/1BawwA0NVn02DerGqZVeMSIHRujyZm4Jh9KA4m2yD/gm1yYAHLbWneGSBKcZy9gKsLQ52J6vB/3oe5KRXLn0cVGcnBaA6HZbt+dLQMBFm1IDXFPhdbC5XFGPIH6Y016BXTsOexFZtap1tfU+VjwwdWu9q+WR+eoL1/9uopwAaGxCPfyu8I6sHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N5kpbLPNJs+MOrZ/ZozHY1e5PxYnnGdG6QybCrcCDJQ=; b=iAwmF6V1UYXGn86B08CeuZhhssQxCFCKr9GghyExvycLhhIMTjEvnMfcw58AeRJcaGMIrZick3WkuyGez7+V30Ey9CMsGSgLYdRvHXWwxwohUJdilRCLpirgFjbNJYzON0J/ET5VfGhSNjqOUi/nPKhuyOoRBtLjysI2QxPUYMALzzOgCQ+lZQk3MkMNJ++4NMw+k2fvP+RurQqJxng08zy63eCVPni9BgXaviCNmwpfwujIDiUf3eEGIh1p2r6mI3Enai8EvCy41hBa+cOT+xGQOuDDOVrWI0tJ3+Tno6u/lapPU3Ua+0aEQkqCXl2cq1AtlloEDZu0ZX+OWz0OXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=yahoo-corp.jp; dmarc=pass action=none header.from=yahoo-corp.jp; dkim=pass header.d=yahoo-corp.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo-corp.jp; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N5kpbLPNJs+MOrZ/ZozHY1e5PxYnnGdG6QybCrcCDJQ=; b=GVR7r0QyE52JGppbrpTPctdDmsqy/KmVcj8GjS5k7eSP0GUmQ7JE9pYHlxQwFyhYpTIcJVZOTM8lwyc2vF2D+jnLHfB5KJZpZZULuWZarnCnO/FnBvHAr8FQBJ5JDJ08PWKHR4KI6R3SF9VUpxbcd83LH1dOo6BXaVUNWfH8iXk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=yahoo-corp.jp; Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) by TYCPR01MB10495.jpnprd01.prod.outlook.com (2603:1096:400:307::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.33; Tue, 9 May 2023 09:38:38 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::316c:fe30:7d04:4f2b]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::316c:fe30:7d04:4f2b%5]) with mapi id 15.20.6363.033; Tue, 9 May 2023 09:38:38 +0000 From: Nobuhiro MIKI To: dev@openvswitch.org Date: Tue, 9 May 2023 18:38:00 +0900 Message-Id: <20230509093800.33596-3-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230509093800.33596-1-nmiki@yahoo-corp.jp> References: <20230509093800.33596-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYAPR01CA0013.jpnprd01.prod.outlook.com (2603:1096:404::25) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|TYCPR01MB10495:EE_ X-MS-Office365-Filtering-Correlation-Id: a814ad51-b222-419d-07db-08db50712abd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bLAg3tTXS9GFNHFUMGFeynTkQdEvJeDfIdc3z0fttlwqicUdsqvy6dx213PaNrtEf5pgX36OsX33hhsqZ823jheWuYFXMRn+DX+DRyAbB0DceoB7KuDtq5D1uUoNp0Oq+h6pXt3ZDp4FosYahPqTXKbJBp1+RpOqG8h0PzpAFwLrYAJGkc+0kejPY/gA9IRDVt6B9lmBTPEz5EA6/X7DZNGo3+3AxjeEvTtwra55+OnoGtxolf5GUUmlLF5TaD2SC9SXUNemV/8m6Mj8j/4OqtFF5ZrEhukhVBXMABM2vsMcLnnQ01rJB9coO/xyPULLqhTngkdRHnUaRv4umnErFjXcUFLCko6T4ShNkfJV6ZmJsq51iKssCsv0d3/fLDt+Jr6TaBo+y8TECmzZJg2CUsk3+wnmzu1SR3XFrZCnQU1zDeGXZV451r3on53Iu0QOTW3u3pPK/XbgxHDiSN4k8tTitgLqQrarjUxTzvgPMU4GrvnQWJ26DtgCMTJ9vJu5jmJ+ITjlPEHvhxypXGh/6r8NZjMWQsLXAaqCgUwVCPlYLpk2W2BnOmb4Uxu0+16PAriRZRlRKzODo9iNjn/LpTuMwridhdeZCyEosEUZZ6AS5fCGNIU3zOGnq00UlUAT X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB4107.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(376002)(136003)(39860400002)(396003)(366004)(346002)(451199021)(4326008)(966005)(52116002)(86362001)(316002)(66556008)(66476007)(6486002)(6666004)(66946007)(41300700001)(6916009)(8676002)(8936002)(5660300002)(478600001)(107886003)(36756003)(6512007)(26005)(6506007)(1076003)(30864003)(2906002)(186003)(38350700002)(82960400001)(38100700002)(2616005)(83380400001)(461764006); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tcIyyu+Vscu/Q8oyPq1X7NmIDWhe+JHvEcexUO4+eKgFfLCLdgDaYTOwCix4RY7dpNUUCV9pBMSntkdwrfG/28jSwYoGi1wCeGN7RvoQS9VujhGRegnTKLyJsQTQL3ld1gJMU3WgBzp3OtmXVlBk8jtHm1m9Zej7do+0oPbhAax5F8phjBC9hAHvNjAMPVjQi9JBILFt7MiKpduO0utZ5jZDJT8GJfFsm5FmSYH5nHvO6l8F26LCyNSN9LGFuenIhE2JwtC0bKwqDdtU/UIBO9Z7DkY9EIg9tnhGxszj3Xudmo/bq4imZ4M/6hcjLjOPJrK6uvq8BzwNakWrRYiIEGKcAcuJ7UH2AqKa1ESmw6aqBHEefYTzbXOK44RXVm0TrvsPdoCHiF5ljeVsGvOOXnhzTMaTs3tUn/7zO8Vd9WEOawBWae//idyz3cY5LsyaPahxd6gdqQarL8ctKprvsOf1MVYDa/TQTxkVMn4M+gg3ZWrrzz4kCi395IQ1P+8eP+7A72jTEir0xlWvsPPro6ldOG234BQyFdRbsBoJdfVoggNXwAUIn4QeLb++GAdtsxSZdp4Up1SM3o8ebeU3L5erBzb5Z1pjpid03VFE6gwn8yuCAB8xJfNgL7cWeN2c31Yuo2wQGRlk1/K0LVQB2o+L6F2XSQnCFBDcO1lYbTLP8uOCm9jxVlnIQKFtjg0UsRwXOxkrNy6VG4PnX3VRP4BIUOJodNKA5kXr9M9NvmG1E8b2eNDe9Cog9ySCww3b400/JR8Vz3C5geUxik9KxxlKETxIt/tYfXNbwPlnYoj6XZtoTGzZBBDmm6ya94i+DWRQsyCZFRHfJG+Sdh6Zi8bFnM1A/CVVlSX+MY5U0wFLlKhTLSRW0ONzbSfy0rq0vaQiheNkTB7ZdQ6u7c1MpeTOThp0r1BtRJ/n3bupwWyBPA6HmCrQuRBF4bVadpwUj9v88zmH4hi8cgxgxiGyul1wrqG4sAc3mcEP+32+A9UPflAMxf3bhNGPqvkiCeV5x+mHmXx2R8W1BrmWWmQjCh0zpwSIum3Ew7NVl/aT8Eg5+aaJ5Szs0o18Xq2x7hp1sHMhtByVIPSVX2MLStUEgRNMlpX7xI3H+CI+S0VZMy4w5JjjNMnQ01bbBZlM2mhiWseIs/S+j7fowb1zRqdIwFhbD+xxpM5mlU2Q9U6wVRJFNGooAzz5T5hWua0oooI/+DDE+8UKixxO3V0/ignTYSeQEnvt2Do9lLSkV3zXisu3nbodzwOsxJJBcDeiwnTctKoJkvGwPa06E9snpb2WqXdTJC5kOb0sJgtoY1ZdIqEPMWxmPZkG99faRAbyE+ru/U68VvE7HLapegRqmqJ3o24Ny2WmTXyEHZl4I4FdgUZhLZqYBbxEOXjXiREI03rtMHmCIMBQpr4OLsD50a91rsdslEyNipMYCoCwDWbvFC2+sUNeUNzrSdVKB+jpzqR9pGZ7IE1CpnDPGtupCVtYNVQVu3PcW0wXc291UoeCWevL/JbrJDrrOMzPQWPV48qjAsqopLCM/x5h4uJS8F/ZF8DqbQYhhCVWdZbZy7OB4pL+weGfLeACs4C28ZOpvgLv X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: a814ad51-b222-419d-07db-08db50712abd X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2023 09:38:38.3086 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +btYo7mU3a0Jhx+7EiAJTIO9AO/3BA5sWILMbw3IdStGVaaBW0zJ8tSida7WRXH55SN1flbmU035pZaUb+ExpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10495 Subject: [ovs-dev] [PATCH v3 2/2] userspace: Add new option srv6_flowlabel in SRv6 tunnel. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" It supports flowlabel based load balancing by controlling the flowlabel of outer IPv6 header, which is already implemented in Linux kernel as seg6_flowlabel sysctl [1]. [1]: https://docs.kernel.org/networking/seg6-sysctl.html Signed-off-by: Nobuhiro MIKI --- lib/flow.c | 24 +++++++++++ lib/flow.h | 1 + lib/netdev-native-tnl.c | 22 +++++++++- lib/netdev-vport.c | 8 ++++ lib/netdev.h | 12 ++++++ tests/tunnel-push-pop-ipv6.at | 79 +++++++++++++++++++++++++++++++++++ vswitchd/vswitch.xml | 29 +++++++++++++ 7 files changed, 174 insertions(+), 1 deletion(-) diff --git a/lib/flow.c b/lib/flow.c index 9501a259e9d4..f27ec4795bc7 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -2734,6 +2734,30 @@ flow_hash_in_wildcards(const struct flow *flow, return hash_finish(hash, 8 * FLOW_U64S); } +uint32_t +flow_hash_srv6_flowlabel(const struct flow *flow, uint32_t basis) +{ + uint32_t hash = basis; + + if (flow->dl_type == htons(ETH_TYPE_IPV6)) { + const uint64_t *flow_u64 = (const uint64_t *) flow; + int ofs = offsetof(struct flow, ipv6_src) / 8; + int end = ofs + 2 * sizeof flow->ipv6_src / 8; + + for (;ofs < end; ofs++) { + hash = hash_add64(hash, flow_u64[ofs]); + } + + hash = hash_add(hash, flow->nw_proto); + hash = hash_add(hash, (OVS_FORCE uint32_t) flow->ipv6_label); + } else if (flow->dl_type == htons(ETH_TYPE_IP) + || flow->dl_type == htons(ETH_TYPE_ARP)) { + hash = flow_hash_5tuple(flow, basis); + } + + return hash_finish(hash, 42) & IPV6_LABEL_MASK; /* Arbitrary number. */ +} + /* Sets the VLAN VID that 'flow' matches to 'vid', which is interpreted as an * OpenFlow 1.0 "dl_vlan" value: * diff --git a/lib/flow.h b/lib/flow.h index a9d026e1ce3b..7b8ef5164465 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -258,6 +258,7 @@ bool flow_hash_fields_valid(enum nx_hash_fields); uint32_t flow_hash_in_wildcards(const struct flow *, const struct flow_wildcards *, uint32_t basis); +uint32_t flow_hash_srv6_flowlabel(const struct flow *, uint32_t basis); bool flow_equal_except(const struct flow *a, const struct flow *b, const struct flow_wildcards *); diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index 55e1bd567fa1..18bd9df57175 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -856,6 +856,7 @@ netdev_srv6_build_header(const struct netdev *netdev, struct netdev_tunnel_config *tnl_cfg; const struct in6_addr *segs; struct srv6_base_hdr *srh; + uint32_t ipv6_label = 0; struct in6_addr *s; ovs_be16 dl_type; int err = 0; @@ -882,7 +883,26 @@ netdev_srv6_build_header(const struct netdev *netdev, goto out; } - srh = netdev_tnl_ip_build_header(data, params, IPPROTO_ROUTING, 0); + switch (tnl_cfg->srv6_flowlabel) { + case SRV6_FLOWLABEL_COPY: + ipv6_label = ntohl(params->flow->ipv6_label); + break; + + case SRV6_FLOWLABEL_ZERO: + ipv6_label = 0; + break; + + case SRV6_FLOWLABEL_COMPUTE: + ipv6_label = flow_hash_srv6_flowlabel(params->flow, 0); + break; + + default: + err = EINVAL; + goto out; + } + + srh = netdev_tnl_ip_build_header(data, params, IPPROTO_ROUTING, + ipv6_label); srh->rt_hdr.segments_left = nr_segs - 1; srh->rt_hdr.type = IPV6_SRCRT_TYPE_4; srh->rt_hdr.hdrlen = 2 * nr_segs; diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 663ee8606c3b..2141621cf23e 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -792,6 +792,14 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args, char **errp) name, node->value); break; } + } else if (!strcmp(node->key, "srv6_flowlabel")) { + if (!strcmp(node->value, "zero")) { + tnl_cfg.srv6_flowlabel = SRV6_FLOWLABEL_ZERO; + } else if (!strcmp(node->value, "compute")) { + tnl_cfg.srv6_flowlabel = SRV6_FLOWLABEL_COMPUTE; + } else { + tnl_cfg.srv6_flowlabel = SRV6_FLOWLABEL_COPY; + } } else if (!strcmp(node->key, "payload_type")) { if (!strcmp(node->value, "mpls")) { tnl_cfg.payload_ethertype = htons(ETH_TYPE_MPLS); diff --git a/lib/netdev.h b/lib/netdev.h index ff207f56c28c..743a56ca1629 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -97,6 +97,17 @@ enum netdev_pt_mode { NETDEV_PT_LEGACY_L3, }; +enum netdev_srv6_flowlabel { + /* Copy the flowlabel from inner packet. */ + SRV6_FLOWLABEL_COPY, + + /* Simply set flowlabel to 0. */ + SRV6_FLOWLABEL_ZERO, + + /* Calculate a hash for some fields and set the result to flowlabel. */ + SRV6_FLOWLABEL_COMPUTE, +}; + /* Configuration specific to tunnels. */ struct netdev_tunnel_config { ovs_be64 in_key; @@ -144,6 +155,7 @@ struct netdev_tunnel_config { uint8_t srv6_num_segs; #define SRV6_MAX_SEGS 6 struct in6_addr srv6_segs[SRV6_MAX_SEGS]; + enum netdev_srv6_flowlabel srv6_flowlabel; }; void netdev_run(void); diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at index e300fe3a0d26..33edc8319eed 100644 --- a/tests/tunnel-push-pop-ipv6.at +++ b/tests/tunnel-push-pop-ipv6.at @@ -1,5 +1,84 @@ AT_BANNER([tunnel_push_pop_ipv6]) +AT_SETUP([tunnel_push_pop_ipv6 - srv6]) + +OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00]) +AT_CHECK([ovs-vsctl add-br int-br1 -- set bridge int-br1 datapath_type=dummy], [0]) +AT_CHECK([ovs-vsctl add-br int-br2 -- set bridge int-br2 datapath_type=dummy], [0]) +AT_CHECK([ovs-vsctl add-br int-br3 -- set bridge int-br3 datapath_type=dummy], [0]) +AT_CHECK([ovs-vsctl add-port int-br1 t1 -- set Interface t1 type=srv6 \ + options:remote_ip=2001:cafe::91 ofport_request=2 \ + options:srv6_flowlabel=copy \ + ], [0]) +AT_CHECK([ovs-vsctl add-port int-br2 t2 -- set Interface t2 type=srv6 \ + options:remote_ip=2001:cafe::92 ofport_request=3 \ + options:srv6_flowlabel=zero \ + ], [0]) +AT_CHECK([ovs-vsctl add-port int-br3 t3 -- set Interface t3 type=srv6 \ + options:remote_ip=2001:cafe::93 ofport_request=4 \ + options:srv6_flowlabel=compute \ + ], [0]) + +dnl First setup dummy interface IP address, then add the route +dnl so that tnl-port table can get valid IP address for the device. +AT_CHECK([ovs-appctl netdev-dummy/ip6addr br0 2001:cafe::88/24], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/add 2001:cafe::0/24 br0], [0], [OK +]) +AT_CHECK([ovs-appctl tnl/neigh/set br0 2001:cafe::91 aa:55:aa:55:00:01], [0], [OK +]) +AT_CHECK([ovs-appctl tnl/neigh/set br0 2001:cafe::92 aa:55:aa:55:00:02], [0], [OK +]) +AT_CHECK([ovs-appctl tnl/neigh/set br0 2001:cafe::93 aa:55:aa:55:00:03], [0], [OK +]) +AT_CHECK([ovs-ofctl add-flow br0 action=1]) +AT_CHECK([ovs-ofctl add-flow int-br1 action=2]) +AT_CHECK([ovs-ofctl add-flow int-br2 action=3]) +AT_CHECK([ovs-ofctl add-flow int-br3 action=4]) + +dnl Check "srv6_flowlabel=copy". +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x86dd),ipv6(src=2001:beef::1,dst=2001:beef::2,label=12345,proto=47,tclass=0x0,hlimit=64)'], [0], [stdout]) +cat stdout +AT_CHECK([tail -1 stdout | grep -o 'label=[[0-9]]*'], [0], [dnl +label=12345 +]) + +dnl Check "srv6_flowlabel=zero". +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x86dd),ipv6(src=2001:beef::1,dst=2001:beef::2,label=12345,proto=47,tclass=0x0,hlimit=64)'], [0], [stdout]) +AT_CHECK([tail -1 stdout | grep -o 'label=[[0-9]]*'], [0], [dnl +label=0 +]) + +dnl Check "srv6_flowlabel=compute" for IPv4 in IPv6 tunnels. +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(4),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout]) +AT_CHECK([tail -1 stdout | grep -o 'label=[[0-9]]*'], [0], [dnl +label=944785 +]) + +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(4),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=6,tos=0,ttl=64,frag=no),tcp(src=800,dst=900)'], [0], [stdout]) +AT_CHECK([tail -1 stdout | grep -o 'label=[[0-9]]*'], [0], [dnl +label=772289 +]) + +dnl Check "srv6_flowlabel=compute" for IPv6 in IPv6 tunnels. +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(4),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x86dd),ipv6(src=2001:beef::1,dst=2001:beef::2,label=0,proto=47,tclass=0x0,hlimit=64)'], [0], [stdout]) +AT_CHECK([tail -1 stdout | grep -o 'label=[[0-9]]*'], [0], [dnl +label=468935 +]) + +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(4),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x86dd),ipv6(src=2001:beef::1,dst=2001:beef::2,label=12345,proto=47,tclass=0x0,hlimit=64)'], [0], [stdout]) +AT_CHECK([tail -1 stdout | grep -o 'label=[[0-9]]*'], [0], [dnl +label=1012207 +]) + +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(4),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x86dd),ipv6(src=2001:beef::1,dst=2001:beef::3,label=0,proto=47,tclass=0x0,hlimit=64)'], [0], [stdout]) +AT_CHECK([tail -1 stdout | grep -o 'label=[[0-9]]*'], [0], [dnl +label=629290 +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + AT_SETUP([tunnel_push_pop_ipv6 - ip6gre]) OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00]) diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index edb5eafa04c3..7a0682503233 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -3287,6 +3287,35 @@ .

+ +

+ Optional. + This option controls how flowlabel in outer IPv6 header is + configured. This would give you the benefit of IPv6 flow label + based load balancing, which is supported by some popular vendor + appliances. You can choose from the following three types, as + in net.ipv6.seg6_flowlabel syscall. +

+
    +
  • + By default, or if this option is copy, copy the + flowlabel of inner IPv6 header to the flowlabel of outer IPv6 + header. If inner header is not IPv6, it is set to 0. +
    • +
  • + If this option is zero, simply set flowlabel to 0. +
    • +
  • + If this option is compute, calculate a hash for + some fields in inner header and set the result to flowlabel. + If inner packet is IPv6, src_ip, dst_ip, L4 proto, and + flowlabel are the targets of hash calculation. If it is IPv4, + src_ip, dst_ip, L4 proto, src_port, and dst_port are the targets. +
    • +
+