From patchwork Tue Mar 28 06:42:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 1762169 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.133; helo=smtp2.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=JFcvG25M; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4Pm0Vh5q1dz1yYV for ; Tue, 28 Mar 2023 17:42:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 92FBB4011C; Tue, 28 Mar 2023 06:42:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 92FBB4011C Authentication-Results: smtp2.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=JFcvG25M X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LP2f2eeWMhxD; Tue, 28 Mar 2023 06:42:47 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id B91024060E; Tue, 28 Mar 2023 06:42:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B91024060E Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 82178C0036; Tue, 28 Mar 2023 06:42:46 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id F0E71C002F for ; Tue, 28 Mar 2023 06:42:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id CAB4E4186A for ; Tue, 28 Mar 2023 06:42:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CAB4E4186A Authentication-Results: smtp4.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=JFcvG25M X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ySDJYWXFSZ0l for ; Tue, 28 Mar 2023 06:42:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5972241850 Received: from corp-ob08.yahoo-corp.jp (corp-ob08.yahoo-corp.jp [183.79.94.93]) by smtp4.osuosl.org (Postfix) with ESMTPS id 5972241850 for ; Tue, 28 Mar 2023 06:42:43 +0000 (UTC) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01lp2104.outbound.protection.outlook.com [104.47.23.104]) by corp-ob08.yahoo-corp.jp (Postfix) with ESMTPS id 6FEB519FB184 for ; Tue, 28 Mar 2023 15:42:40 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dwX/I15MbJIl3QtgLM22ATo/LF3QDZpboRDghykowUn7j4Vk57xCD2tgAXw9Ep3JI0RI/VxWoCohNquRhjZpjicGsbI4u78DKmuEzA25rUTOd4hhyKJKkwqriRgQJA8GExgS2qIoqmL2noq1KntkPXvDvp+NbHBRxY5JTkZVU0VgcKTN+lHSf/WzQIb5bqKecuAr1zCJU581KrRMqcm0oijIFCzCuQ4/BUPaV5zvqwQF3RCAmQ2UcEyr6Kt/Wpacyw/7W3FjH+gH/wwM3g2kgEWNWQbmwwy6btycaWI7ujhe0f19AlyEWEead7DFxNBu4sKK8jyeA0Nho0TzSWCKMQ== 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=aHs2bTS3F2joZY3TtdXRaTYs46qB0SIJID4fsiZCAZM=; b=Nqdpjy+OqjkCQSUuTx0ffhOURnJjB+Zv5/NTy8M/2BzSCm3n9rVhq26+N9CDsIjgEmDJ2+Osu+eOOqp3kBn+Twb3Uq/4QwVwy9T/VydkX09d/mz085WmMtoCPvcW/MM21UgOHG1AdPkDSagnHi5qZTLrC0ZHQuf1GIXWEnRsuLSpR2pL7Q2dGgahrnC0GXLHT25I6VzcLcjIoe/1UwW+PmSGpfEPT1Pp+0RCw3Qwzx1AW8CYHbH3BzHAqeiHXvMfbzaBI5XPd4sHoJaJsSOfAxrxmY+mhUp3IMoNt3Ub3fu+blfvX/oRjIvUjjMpnS1q6PmMSpx0h5aewYS4P891Mg== 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=aHs2bTS3F2joZY3TtdXRaTYs46qB0SIJID4fsiZCAZM=; b=JFcvG25MEALP9rNqoBBBtWwj0asF8g039rncH9me0mzmjDWxGeTTveaBaVpvaeYFh6TYh0lgUdZ4jm8GkvlQXihSvRIdCDajorEWk8qQ/pJv1TtswkNcL5fW5zS0wXcu1ycvNHXYQRBmgdWxMOBURdeHrTls+MPPEVbWS7gqsrI= 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 OS7PR01MB11871.jpnprd01.prod.outlook.com (2603:1096:604:23d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.33; Tue, 28 Mar 2023 06:42:39 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1%4]) with mapi id 15.20.6222.030; Tue, 28 Mar 2023 06:42:39 +0000 From: Nobuhiro MIKI To: dev@openvswitch.org Date: Tue, 28 Mar 2023 15:42:19 +0900 Message-Id: <20230328064223.51144-2-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230328064223.51144-1-nmiki@yahoo-corp.jp> References: <20230328064223.51144-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYCP286CA0043.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::14) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|OS7PR01MB11871:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a4e402f-99ae-40ef-d407-08db2f579f9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MVOWyZWLO4IpDPCHuEJRCSfTPqloW2WHv9REr1LGHZkQ9uR1p5qaVUse23PdbZ/fao+pOMAZUURUu9YUzTL5dn6F1tQOQqHGts1LB2fFEc7nusSxRXiGM4offAnWt/QhKCu7H1LdVxRLYmrUy5BK+lI42MGIdsmGIE0+1XfvZ9XvMuAJQ/43x4QKmMZHbLJn1gLcknPl1mVBWRgi0Wm9hDnlvkAgp+x4A3TjK5maifoo2+Cu3UAHtdcWWF6yp9RX6h9Jg96MFJuo0fQMCpWqA6kNiGcNw5Mo9a/doYPBw5wS1hZXCCSfPlqNLbGNL12K+iiELEuad6H0FloAg/X0JRyLiNmCaEloJ5Q7BZr8r15BuNeWRHiucR/VP/9JznHCf4LO+rNzZWnPI5RtpXxt8+bO2HzyYQENh7IOSA6hg+CS2ff/1FrPTxu3hljeNj/tYIoLZg9Y6hFBbwzlZgN6jAM/JP3EVsSHcsJAkITZ49mKvp0W04u3/qazvnZf1Ulzk8KrkT9WQSz5MoLzCALB1Co32XdACHXDZPjetxRtX772ZdvE6mP1ePZ+5pmP/zup5iW4F4xBjR2LMnX0QfF8/pHQStkZZSmtD1B59u7gAwUfjEsvakPWzzPKTtU9C+Bv 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)(396003)(346002)(366004)(39860400002)(136003)(376002)(451199021)(38350700002)(86362001)(36756003)(2906002)(107886003)(478600001)(6666004)(6486002)(2616005)(6512007)(52116002)(38100700002)(316002)(4326008)(6916009)(5660300002)(8676002)(66556008)(66476007)(66946007)(82960400001)(6506007)(186003)(1076003)(26005)(8936002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lP/S6CGy+a3KtB6U2TK7H8OFo0N2YhzFfbMLtbWFL2URw/Ikd5h33OhBf1d404/6CDg4LIfAFoby88iXYqP2/ToYoOj5H2Xr/aqDuI7wBwFSqm2yqpcKYRf9m5wvGgeAtyI8wNGx437AMjYx6vdVbsq4sewH9C3QBK0wcvArWgcivPLIo01XYMyfgQujDBpZ78xVVQP3mnyB0W4C4ILPAfAuh57Qo6yI7iLOSBsQ6zlYN78q3qeC5Vtto9N47eaj8lduGTEM+sxa9zRV9FIEPuRDFZP7WFtEBpgKuQC9LSVz3pRQ/Oun47F/Ag05wGqshWdmM9A4QZAQgbvDZ5eazNkU7ktpdw8CPNGocqxtyphKX0lo0/TPOvSSL2QHtto33ofeSX2mLjtfIIkrE4+q4oBmzNJphzTtYsKa72gePR0b8E+T5AbyEalnnpIDUbU8w0dNsOq1KrmBRCi3AdGxdO/sXzY9BxewjVSGKSWSDU77EzlwpQLqyUHJjMvmmKbDtHL4birlk8vzuyCzLYW2CcXjJK7lb1C+f4Iv4V3ORqIDKdnBDeQwo85EyoTvUESaK7DIJYpAunB6DqPqJJl5LOsIDCVS0L/vGLXe2znudKRP/sL4RhA+Cms7KCm498ZbI2nepQEHGD7XDi5T3g0eFkWeNHLWHXu1aZTxQJHuNjRxIzIreFDXDcVEi/HxNL3MHvaiWDDPInH3MyMoaDP/OvUj+JjTlTkaYd3JMrdoBnn1VLTkRZDvq4BKULtHDtSbY2HhaxIaIKUDZ2+x/DHmxTq1qV4u5hjpiS3dRrkm0x5vd/1rktzTFk6IunhiTrCC9KHbpRNKyJK+rZQR8t1Eo2lBhKKif3KWdQJW0ocaUY5Tr6sJMwykJgSssal5vK05BF6AXXSIW3S76UedQJ5GETe22x+RbpvOEeYerYivskB6u7rTJyKJQqBssGRMJntN/7QVZu2U+isH+MpNDk6Ykga2xORkLC1mULjaXzNve7yN2B9H6jtms9eCj9bCviN5j9rJk3ulSyE0MT/n9c1RaDAYTNLfP4nX1/YpdZfG+97uof1St27G1p0HU90NpLld9+NyJzzytz5FALAHojD6Ca38ql2FxuNFCdFHYG4HQWpiIO63x8rXRWm0kmwon9xVL5sAA2wKMWygar9wS2M5TB/yF43SeLuYteF8bWozGiKM64ta5Ts66H+NiAop1DCGxCeho+HSKakczTFymPC2qaec0l0lXUPbKzFeTLKMFBzOfo0pafihiw0qSA5xIU5PYE55Q3kkDoj5RyFTy1D/ZtszZqPQb19X3ta19L+Vy+higTJTSlcQJZmAjs4iI3WVG24fCK6vESPmmy8NEAA8y4ccn3HG8fED117rkXACmbkGOjGbqt8dt558omyfntPhbMCDM08G0E9CkXRlXZJU5Ef2wAjTHjcAVjl9LpLoxMOnVkZjZdCDrdutNarSoXokprtyIgJF2xVkiOQiHZs9PVO8t+ORGKDxIO9HewoWwd6hLL07MWVCopLnwIwxVsw7ThNNtM6V+CEhSLrcdkPnI8vd6Zy5WqImXeYx9NjGJk0VykJHrw4XgreDAQSCM5s8 X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 0a4e402f-99ae-40ef-d407-08db2f579f9a X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2023 06:42:39.0544 (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: bp+asGqZmlrryzJn3HT8LoEwHTbstoP8e72YrrU2V8sf+RfdY+Le7+jJzS4+6G6GNTX4C8AK6Oxe5DbpxWJUGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11871 Subject: [ovs-dev] [PATCH v11 1/5] tests: Define new ADD_VETH_NS macro. 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" The new ADD_VETH_NS macro creates two netns and connects them with a veth pair. We can use it for testing in a generic purpose. e.g. ADD_VETH_NS([ns1], [p1], [1.1.1.1/24], [ns2], [p2], [1.1.1.2/24]) Signed-off-by: Nobuhiro MIKI --- tests/system-common-macros.at | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at index 8b9f5c75254f..0077a8609c02 100644 --- a/tests/system-common-macros.at +++ b/tests/system-common-macros.at @@ -126,6 +126,22 @@ m4_define([ADD_VETH_BOND], ] ) +# ADD_VETH_NS([ns1], [port1], [ip_addr1], [ns2], [port2], [ip_addr2]) +# +# Add a pair of veth ports in 'ns1' and 'ns2'. The port names are 'port1' +# and 'port2' respectively, and the IP addresses 'ip_addr1' and 'ip_addr2' +# are assigned to each port. +m4_define([ADD_VETH_NS], + [ AT_CHECK([ip link add $2 type veth peer name $5]), + AT_CHECK([ip link set $2 netns $1]) + AT_CHECK([ip link set $5 netns $4]) + NS_CHECK_EXEC([$1], [ip link set $2 up]) + NS_CHECK_EXEC([$4], [ip link set $5 up]) + NS_CHECK_EXEC([$1], [ip addr add $3 dev $2]) + NS_CHECK_EXEC([$4], [ip addr add $6 dev $5]) + ] +) + # ADD_VLAN([port], [namespace], [vlan-id], [ip-addr]) # # Add a VLAN device named 'port' within 'namespace'. It will be configured From patchwork Tue Mar 28 06:42:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 1762170 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::133; helo=smtp2.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=PIcFGHD7; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4Pm0Vn0trFz1yYV for ; Tue, 28 Mar 2023 17:42:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 26A3E41173; Tue, 28 Mar 2023 06:42:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 26A3E41173 Authentication-Results: smtp2.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=PIcFGHD7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lsMcWMn7JfXf; Tue, 28 Mar 2023 06:42:51 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id AB39C40CAC; Tue, 28 Mar 2023 06:42:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org AB39C40CAC Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 66A56C008B; Tue, 28 Mar 2023 06:42:47 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id F23C4C0036 for ; Tue, 28 Mar 2023 06:42:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CB0E160E96 for ; Tue, 28 Mar 2023 06:42:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CB0E160E96 Authentication-Results: smtp3.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=PIcFGHD7 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 IEseKWNSW9hg for ; Tue, 28 Mar 2023 06:42:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6E53660ABD Received: from corp-ob07.yahoo-corp.jp (corp-ob07.yahoo-corp.jp [183.79.94.94]) by smtp3.osuosl.org (Postfix) with ESMTPS id 6E53660ABD for ; Tue, 28 Mar 2023 06:42:43 +0000 (UTC) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01lp2112.outbound.protection.outlook.com [104.47.23.112]) by corp-ob07.yahoo-corp.jp (Postfix) with ESMTPS id AFE8619FB180 for ; Tue, 28 Mar 2023 15:42:40 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bRuEhEEzXAo7rvzmVV9450etwjwIQYULiW55VLyb2mG6aSB+IqXJKfBM5i68xUWJQZLEYbDsx4EZ/wOZ6twDGVNGTqNQlHauayt9S6mlgSnwiuUXxc3USve3njHx0eqn6C6LVtpKS+2dzVk2gomoK4J4yngUF8nxr6HY/DDoc2tGws9x3EKrcEqAOeUp7YV6nD3LwyVZ+fRKYzKPDXe15Un0Z3k9sTCbk8DJ3DQxEKpXLzfALPQTaFsvqdNdZOMM+5ESVr/MIm4JrdOH3IDH8+uQbWVKYVXzm6FAozHT2aoaU5x3HK3HDGZBlqPmqKD4+RHplQIItZJIJe91HDpvvw== 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=KmgcZEtEW5xGM44Tq2+JV30nC4e++3I219qbp5UixDI=; b=h1iIUNN6UejZcMi6sldS7BBIGppQm5b6PBSU0dKV9xAUwPZs5/oOS6zt4PmeAK7iRy8RSwSxgsbg3ZE09jmi0WGAmR18QZiS41MppMH16OdtuSzIlGE5x6e9A1lGrrR2kaUSZkJfRUk92IC6Dpf5moYIPDjjCIW52PxdilHZSpNv+BUnrBFV/meQvh2HlXC5tecijVAEOvNjB+ePAdRs+gaJ2ncZOzAGUj0EaiOG87SueZEVsULxhkf2BLmNsw98qSuJ97x3nrDpdSrndt7qc4HKR20XEQNPFlzsAi9YF+b2gYj2QL6a+cU6OGb/xeMQ7PaYP0F/JzunE5AWbFNA3g== 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=KmgcZEtEW5xGM44Tq2+JV30nC4e++3I219qbp5UixDI=; b=PIcFGHD74fLXWsVOGEKLaMT1OHCYEYKs0g/qANbVGygO9RZhPXtLkdmzH1DAIzPwez0nF6fLHT8NCyfhPPvWxIB9I8gdvoSFz8jjQk6PRlzV/grzSrpXZm/5d0v43wh+p1+DRc7PTCvjY5nMOjhT0pnHK5eWCCeIm3hai1tuyd4= 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 OS7PR01MB11871.jpnprd01.prod.outlook.com (2603:1096:604:23d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.33; Tue, 28 Mar 2023 06:42:39 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1%4]) with mapi id 15.20.6222.030; Tue, 28 Mar 2023 06:42:39 +0000 From: Nobuhiro MIKI To: dev@openvswitch.org Date: Tue, 28 Mar 2023 15:42:20 +0900 Message-Id: <20230328064223.51144-3-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230328064223.51144-1-nmiki@yahoo-corp.jp> References: <20230328064223.51144-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYCP286CA0043.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::14) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|OS7PR01MB11871:EE_ X-MS-Office365-Filtering-Correlation-Id: 021b4977-7dc1-4edc-824c-08db2f579fca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QYg7fFgff6enjJ68YpIRl0YyX/+CbFtOWzZuq4JVecHrFPXsNRUy5TyfE2T6CEJXu1E+4lUAW/riz5tFGeTEFjfX/KhUyGvB/MpXx0VGoe9dIPw1OHMOmVy9ba4NYEeSppdNu+IHjAzw3uud4H2utfvuGoYit7pkAhMXnpSHPDYphyklRT3BvFtCvTpm4BLgwkanxMXOneYBaK20NzVdkPAISORwQG2PZObUrWh7z1HLpvsNvVsIAaHF3D4KOqljYWKXWO19CpOQcM4Poiqnto42Vf3ZCiy7JWafxUXnFkIuUBYxL+u6TjPJkdpWpbbXaQyUbf5w35aew2/NkI56IxXTIsGmJoDR9Wxs/8b1nwczNIwWEPiAJUqk75a171VamEUPXrRHQsXuH0zklf5wGvovniDqt+6JQIDjbv0go8+oA/hhlGxDpY14S/t+X0Qgk9mp4zDvsvStYazYFAvJLBoj4vEcEnfjQfdukU5WWQQcYbosVoQ0wsGHBuWfWA0WzSJF1Rhz7zeFzjbOL3rhaJBg5383K0cDa7cjy3uxZoSl6W1lX3xt8RrjwwKU0X6h0OyniH24+0NQHoppn/7IUh0dfF/dtWz/nFvLv6XzVewCDaC+s/ul4cCQU1Nmr/LD 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)(396003)(346002)(366004)(39860400002)(136003)(376002)(451199021)(38350700002)(86362001)(36756003)(2906002)(107886003)(478600001)(6666004)(6486002)(2616005)(6512007)(52116002)(38100700002)(83380400001)(316002)(4326008)(6916009)(5660300002)(8676002)(66556008)(66476007)(66946007)(82960400001)(6506007)(186003)(1076003)(26005)(8936002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W/Q6iDDiN9pt0ER4mWqQF9Sau6d89WEoGP4HvdRc9U/JGzUDGu5iZsb98prCnWLgj0ctabcGvChU0gzFnFLMjPC3FCjAHdT9Rqs0mFQb8NpbQOWJj+zK9VTrc+7L8kw0jx+bfWeecRmOPZca+/KWmIycADpU3mpti/O+QhqNqz0DGURn3QsPjt38qSpRPCvTwLngm+NUsu3q3oButkdi/zxs93muru40dpzm0LYCzfUPN12BQD/Z2m/PDqXykHbGo8HvOqmzjyA3l4+iCesC/ZophvPxiVlmUHp3wU+S5+onysgClAWIzfsMhnMiBm7G/fFYLzkkz9Qgmmv2jAcbs49HUAGaMo4H+zhbtW4uqvE5MMgDtsMd7r9eATSl3zjIdZhq10vtS62D9XCgZkTWA5InlqWFbbGCtScvMHZyIYm6eTlakwBMJSLgzIA3pmL1d3LtIcriyyjtrq4OHWPF3P3FGlPUtKMRHG34JvvbdSKoX+HAv67ZY0el5NN2v5gHKreHFvnu6GgU/Atm5pJvwh5NWZTCmFbsEqgOvO5LX8R30tZDalCBSDtDa1RHxIJfKcNXMZ+rdnXiwr53ySlS5JtKASD4NUodQ8XJxL4Rc9aveeFTBdTgcjV5z7huHJIgG0uqSCLgRxI8X3Df12+CSdVSGsAVgEQgVuQEUCTBWQtSRngX1yfObpUAY78wjXeakKPUAjyc4qaLCO1OQjbTDly9A1cG2DEVxNTuh63zmx5qotOMpcHwtwxatC+oc701Zr4gmS436EPr5mbrNuHecY2DtOa8pQhiHOULVxxGYmLk7D3nJjocytrkwRktUrxMiqBD3QOP6nbIMUpU3LL+KGmI877s1A9LHysuZzM2b72nyvnw0d/8uvdbKe/QPlJJ9j/XTs2QYkYb/Ej0bZAFJo0k6CCwS/fhywOfBn/C9txsmNS00MWLGGmhHSit9lP/apF9SoABvdm6AXdlqStH98tpyXeqHy+IOge2MHr2cWK8WA7tYfbqyQV7WUp7w6OFjMvv6qDg73ioPjzS7sEBM7M5udqIGveE2G6cYeu3u5FPU1HoyeweMr2s88c2DuRcdYksihRxqywvAY1F0ApaySrV7tSOgjoPczKzm4VslvIhgY6DmuWtmI47H3SigGM8AFqntmiiJp4dTfWoUU0lJOs1JDtpIZJz7BBeg4zMEv/H1+Ju0Bkpi02124xbsO/ouaBPvaYU0Kf/u2WJGNageD/kWHwv/8ArJY6nED1x5HFvmKijhZQxsGm/mUNJBXNDkpbjLcVklu8NNluNqxDew/7G2/UY3vARnsytxdKkdZo9+yAyNWh3JKlk9bI1W6Kp7rbp52lk0ZBYyeIpRvasZCDSxYi6bdZ9xTo5h2ewJkV4YNUpnIKOLT+ass8p41fD4Vsv1erNDQC6slu/hKvKzkgrEiwU5xb1lje+7Q6xI6sDuOxwJsZb9IHwaAhX75bFzerIonuJ9P9pgJz9oPyDft4OYVe4VRqgThvpnGfq8XE/zD++7pgN5PgWFAlO3oIYSrxEIpR+TsUrPM2K3w3IkaNWGoSxbQCD+M/b/PCebIJOWbtY3Kal96wiA/t/DEO8 X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 021b4977-7dc1-4edc-824c-08db2f579fca X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2023 06:42:39.5280 (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: LzKZvf2ZM+Z5QdOexCq49ZOnAWeONw4rKsAIx5/Xo63ER58m2fwzAba97GqSnltNvhphtpGWR6JPv161qxXUuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11871 Subject: [ovs-dev] [PATCH v11 2/5] tnl-ports: Support multiple nw_protos. 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" In some tunnels, inner packet needs to support both IPv4 and IPv6. Therefore, this patch improves to allow two protocols to be tied together in one tunneling. Signed-off-by: Nobuhiro MIKI --- lib/tnl-ports.c | 80 +++++++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c index 050eafa6b8c3..829457ee50f0 100644 --- a/lib/tnl-ports.c +++ b/lib/tnl-ports.c @@ -161,40 +161,28 @@ map_insert_ipdev__(struct ip_device *ip_dev, char dev_name[], } } -static uint8_t -tnl_type_to_nw_proto(const char type[]) +static void +tnl_type_to_nw_proto(const char type[], uint8_t nw_protos[2]) { - if (!strcmp(type, "geneve")) { - return IPPROTO_UDP; + nw_protos[0] = nw_protos[1] = 0; + + if (!strcmp(type, "geneve") || !strcmp(type, "vxlan") || + !strcmp(type, "gtpu")) { + nw_protos[0] = IPPROTO_UDP; + } else if (!strcmp(type, "stt")) { + nw_protos[0] = IPPROTO_TCP; + } else if (!strcmp(type, "gre") || !strcmp(type, "erspan") || + !strcmp(type, "ip6erspan") || !strcmp(type, "ip6gre")) { + nw_protos[0] = IPPROTO_GRE; } - if (!strcmp(type, "stt")) { - return IPPROTO_TCP; - } - if (!strcmp(type, "gre") || !strcmp(type, "erspan") || - !strcmp(type, "ip6erspan") || !strcmp(type, "ip6gre")) { - return IPPROTO_GRE; - } - if (!strcmp(type, "vxlan")) { - return IPPROTO_UDP; - } - if (!strcmp(type, "gtpu")) { - return IPPROTO_UDP; - } - return 0; } -void -tnl_port_map_insert(odp_port_t port, ovs_be16 tp_port, - const char dev_name[], const char type[]) +static void +tnl_port_map_insert__(odp_port_t port, ovs_be16 tp_port, + const char dev_name[], uint8_t nw_proto) { struct tnl_port *p; struct ip_device *ip_dev; - uint8_t nw_proto; - - nw_proto = tnl_type_to_nw_proto(type); - if (!nw_proto) { - return; - } ovs_mutex_lock(&mutex); LIST_FOR_EACH(p, node, &port_list) { @@ -220,6 +208,22 @@ out: ovs_mutex_unlock(&mutex); } +void +tnl_port_map_insert(odp_port_t port, ovs_be16 tp_port, + const char dev_name[], const char type[]) +{ + uint8_t nw_protos[2]; + int i; + + tnl_type_to_nw_proto(type, nw_protos); + + for (i = 0; i < 2; i++) { + if (nw_protos[i]) { + tnl_port_map_insert__(port, tp_port, dev_name, nw_protos[i]); + } + } +} + static void tnl_port_unref(const struct cls_rule *cr) { @@ -256,14 +260,11 @@ ipdev_map_delete(struct ip_device *ip_dev, ovs_be16 tp_port, uint8_t nw_proto) } } -void -tnl_port_map_delete(odp_port_t port, const char type[]) +static void +tnl_port_map_delete__(odp_port_t port, uint8_t nw_proto) { struct tnl_port *p; struct ip_device *ip_dev; - uint8_t nw_proto; - - nw_proto = tnl_type_to_nw_proto(type); ovs_mutex_lock(&mutex); LIST_FOR_EACH_SAFE (p, node, &port_list) { @@ -280,6 +281,21 @@ tnl_port_map_delete(odp_port_t port, const char type[]) ovs_mutex_unlock(&mutex); } +void +tnl_port_map_delete(odp_port_t port, const char type[]) +{ + uint8_t nw_protos[2]; + int i; + + tnl_type_to_nw_proto(type, nw_protos); + + for (i = 0; i < 2; i++) { + if (nw_protos[i]) { + tnl_port_map_delete__(port, nw_protos[i]); + } + } +} + /* 'flow' is non-const to allow for temporary modifications during the lookup. * Any changes are restored before returning. */ odp_port_t From patchwork Tue Mar 28 06:42:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 1762171 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::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=js+PoATz; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::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 4Pm0Vp67DYz1yYV for ; Tue, 28 Mar 2023 17:42:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DB3CE61199; Tue, 28 Mar 2023 06:42:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DB3CE61199 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=js+PoATz 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 Kry4QkfM9FEC; Tue, 28 Mar 2023 06:42:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 3CBA261169; Tue, 28 Mar 2023 06:42:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3CBA261169 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C8ADEC007A; Tue, 28 Mar 2023 06:42:51 +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 55DD7C002F for ; Tue, 28 Mar 2023 06:42:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0237382181 for ; Tue, 28 Mar 2023 06:42:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0237382181 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=js+PoATz 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 E8t0AmyyJDjj for ; Tue, 28 Mar 2023 06:42:44 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D638982155 Received: from corp-ob08.yahoo-corp.jp (corp-ob08.yahoo-corp.jp [183.79.94.93]) by smtp1.osuosl.org (Postfix) with ESMTPS id D638982155 for ; Tue, 28 Mar 2023 06:42:43 +0000 (UTC) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01lp2104.outbound.protection.outlook.com [104.47.23.104]) by corp-ob08.yahoo-corp.jp (Postfix) with ESMTPS id 3EAC719FAD65 for ; Tue, 28 Mar 2023 15:42:41 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H4zY2YHsWiapnf2Jdq4Jht+dg45YelAqc5kKJ3usuAvquswD4HhFtl5dEnDF80jIa1sRs9YAwoZURaoOgR4ZXQ/xOgxU0m+7JyAecwWC2yC++epA1SzcMsM50cWmR3pm3wLG1a/hhPkxhaqj8gFDdc4f8BwfQzg/YaEhs7Z/z3iNq4D+Ni7Nx3S3Vk3YqznCMsORWz8r5ln06TaudjG6Lw1xiRcpmN4PdE/5maAAEhzMf5Lmep6ZTfxFzzMqMDZbuHYFV0LkcMshVqhQgbSdPhbfT77fA9I0fCx1UNTg8fG1yXOtMc+IyUdDI5J9ih1iKwh+r8b0VfKEnWB+azrfIg== 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=gz8d7RUbLFzyjvKK6UVLNaPVa9SeqXdTvmQmAqBFAH0=; b=knzeVowUlNB+RqSKvXurE9PAl04f435i45sADayn2EKlBqHVVXhdFEkadnZB4guYxTimxE+20r5HFhJRZaJ9zB9dbDrF2fdp5gLEFkRYKOLWbw6WhcAH3sAImGs9scKeU0KBUrmn9jbFkvWHMoYNumQH5g3Q5YerYGy6aPQ36Zdx5w4BITOlrATGRPzXKO53pNoSK5D0EaxhMPW9yfYZoMgpqPPKeaKePTg6ZwZs4el/4KD3EeZTtk0Nu2tOFw2F8rIVsOdlW/JJRcsyIP5l6tr97vZB8anjFzByaLl0uPrh8qdPO8MWrM2xg1PDjf4mpXj7Da6LrWWWZx6kMvhlfA== 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=gz8d7RUbLFzyjvKK6UVLNaPVa9SeqXdTvmQmAqBFAH0=; b=js+PoATzTfUX7WRKYiwGLr/YiRJNL201A2gzh8I1PU1HH4IsVXujsU93AUKQhAGXold1QnSpwn2LvgqR1ex+XzkOUCbCPvttU9lD9ALdhEZRRkgpHAaXeHc/iST8zkg4r5kyNTrJpo2hTXzoLceNfZaSmyHOBoKsEez5bJ/tLbE= 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 OS7PR01MB11871.jpnprd01.prod.outlook.com (2603:1096:604:23d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.33; Tue, 28 Mar 2023 06:42:40 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1%4]) with mapi id 15.20.6222.030; Tue, 28 Mar 2023 06:42:39 +0000 From: Nobuhiro MIKI To: dev@openvswitch.org Date: Tue, 28 Mar 2023 15:42:21 +0900 Message-Id: <20230328064223.51144-4-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230328064223.51144-1-nmiki@yahoo-corp.jp> References: <20230328064223.51144-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYCP286CA0043.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::14) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|OS7PR01MB11871:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c70bd07-21c7-4f3f-07b3-08db2f57a012 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CyE5bi/LPtN4rwuFIczCis8Gp8CfpUBh2/iELzrJjU5otNyLz46NBAmMtQVKmCH9yxhoqUli/o45DANIE4pfZ6i68u85uy0hvNg3i72sA/Q8pNmhtMRZRrGuxTb81xfbW9iBpVV3mS6rJsoXe2dvCzI8kbRwV49OL8Etoi4gd1/6r2RShXSXT9w0g6alo9EdAs5dmU8xS2LMT4l5ldoy8TX65J6hsxDo95FtpV3e8jpFMfzy1Li8P9hP0zx8RiynUJ7C+MxlFF5uivapFlpofC537Ncf+EPMheb50hrrON6S0WcO76FLh8sVuWfvgdTMXt0LN1OxzY5bykLRm3KdYKaF1PetDRtjqT1H/3rfLwa4KHefK3ZoYLXx/MOgHCJM3XkoI9//LphAos2kGt8FKA56BB2ZvpG0/0Z3OlkuKk2ctqn+JcjxEzU9zjSSpAVGnZBKUVWZk5LysH/Lyp7F8+zDPw33nIKuHmMn3Cbr8deqKMhUD6ISm0WYL11kGK1bp4AMu8c7LfdgjxHdxr60U0dGCpyrIoFsq7npSRmnMH51rsENFp5r5DOso74OsBkLFmSisOupQf43/xcn2GKttY+orYQvz/5AVMvFCqK4QbgR+vJ7AhujP/Gt8QB2o81w 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)(396003)(346002)(366004)(39860400002)(136003)(376002)(451199021)(38350700002)(86362001)(36756003)(2906002)(107886003)(478600001)(6666004)(6486002)(2616005)(6512007)(52116002)(38100700002)(83380400001)(316002)(4326008)(6916009)(5660300002)(8676002)(66556008)(66476007)(66946007)(82960400001)(6506007)(186003)(1076003)(26005)(8936002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: suCXssftO3JAp4GrvU6PO8K4+L88zfwsW8H/OjlGdKhnji8kJhNL926qVDJbtPV2bT0UrB6xYntdDSrHPk6mgcD4viDNMrO7pnqimbv+VTBf1yxTKX+zB/0wf7LKfUhZ3Myp5Bv7J4j40qBx4OgIBD7dF6jmpaxEd/jRsFECwp6OgQnZSCXz8DfH23b8c6f+P9SegnbOiHc6HayzExZSUMAJIscL2ed6O9ujaeKZDYS/mO5ZdIarDCKdlDj4byFmxTZ65S41+5duwssYCWIEQmOaHWzBnsEch6pd9TpqgksMEYFKi9XpKPeM0L4GrCEqKfGWQb0Jy7OZCKFnGVP8kzpvjTX9A9wY86CpoadpuR4t0kkJHOpyiZxAE3Kg5P8Hr/J2naoJ2LxXPnCTjp9NsVRDL+DHhgyiE7BihB9G/PsRjAZOJ3k9WH7i2H3ZZUIr7sbgl2KsMTwJhR3WVSbITo1kZHvu/Fez5ZyrdaHSigPZHRF66RWR/Dhpw7iXZ1B0H2vXPSJhUuu/mhRp0uinaH6yXOUcTDszGV8bYUtxf8T2pa4FZ7MRC6LZXQoA8gR3cR33OnPtroz3Fv22xK6XCqTn2ZY0ikNj65SL84nmHtyGf+GULCQ9s9XCXHMNOIy/btT/2tHAW6shZ5yEnjZgQCiNP58nzH+3Ma8NOvkCVDgroTt6JIBLcE5zAxPqoaaFcKthAtLN4ncwBcxNWO3a9kZQarTPOlU5VwFrgJwD4v+qS7Ed3w5ICAwQJyEiZ5Nellgvl1EOBU49pQyfQ37jfUdobKdkomfXDHMKaW60SG3hCdjkomi+kmu0TO993gG4HWD+c6kwjI/BUw2jDRXw3i+bgY7gsmMRS5DAw/DesA9JC/Dp+fSg+386G6StSdoRr6N7idYKlYZ4QBTIvXHe4eJA0DnKbxBmbHifc/5oKDhuTyXoP8tFemD7CJGjLQm5B3hnAtBypBnRNId/nhgtp8fPxFTH137DDwIcT0/yRzgkIeQsx8HkvkHgRyRUpcNecdj6FR+BSH25p1D3rXp3l7PNvAxSmDX5RkIuZX0Pn2XSZvY4iSC4J4zoGNey2ZJwHtUasK0Y8bSOljLyXvQ9O8cnuAFP/HG/U+/PWiGL49kbG9MVVJl+vvF1RwqEV4kGUKxgFEb7BPRDP3gddkwewVhF0W0pGtbH6vt/3As2E3S8c1PLW34Vwu22fNhv7+UQp/orQJVTFWczq4y98598q9Y3k1tOM8ZRzaihfc5MCTsDFs3zRzuCUus1tw9YCFAdc9zzVfRYZJwMa8iodtCxMEHpp/RfXWVixmgzFEcTQh4BWpBBOF6s1O+OSDjOzG+4GFbP9Ew+W0zdP+2DC/CSvSPLeLw0O0mSGgrMaE2VA0xjo+mnb2AKOOO8MLPAKUMT12iVuC1WLq4gQS43ooubZOWU4Nu/kaIts+0OMUjMnk9cz586QPKeE3LxCi1gu0z7d1EiYJhhmexPm5ABoD8AuGOsd6YesFJJZ+nXjB1HvYof7jkCCLEIHolTzA3HeobE/cFJHguILiqrfz7gDh/0OcXiL3zHKjDJF2m8inhGW8D+lv3ZbLJUJvOuY1DF2nRS X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 1c70bd07-21c7-4f3f-07b3-08db2f57a012 X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2023 06:42:39.8449 (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: n4y1y1JISmZkU4M/gllQJwdeqX6EGYZ2O4ebSvKtZLQuViBQN7wJma/WoC701d36J79ZnDrAULZJA77R0MGp6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11871 Subject: [ovs-dev] [PATCH v11 3/5] flow: Support rt_hdr in parse_ipv6_ext_hdrs(). 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" Checks whether IPPROTO_ROUTING exists in the IPv6 extension headers. If it exists, the first address is retrieved. If NULL is specified for "frag_hdr" and/or "rt_hdr", those addresses in the header are not reported to the caller. Of course, "frag_hdr" and "rt_hdr" are properly parsed inside this function. Signed-off-by: Nobuhiro MIKI --- lib/conntrack.c | 4 ++-- lib/flow.c | 48 +++++++++++++++++++++++++++++++++++++----------- lib/flow.h | 3 ++- lib/ipf.c | 15 ++++++++------- lib/packets.h | 9 +++++++++ 5 files changed, 58 insertions(+), 21 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 8cf7779c6703..f86fa26f466d 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1617,8 +1617,8 @@ extract_l3_ipv6(struct conn_key *key, const void *data, size_t size, uint8_t nw_proto = ip6->ip6_nxt; uint8_t nw_frag = 0; - const struct ovs_16aligned_ip6_frag *frag_hdr; - if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag, &frag_hdr)) { + if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag, + NULL, NULL)) { return false; } diff --git a/lib/flow.c b/lib/flow.c index c3a3aa3ce45d..9501a259e9d4 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -479,9 +479,17 @@ invalid: static inline bool parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, uint8_t *nw_frag, - const struct ovs_16aligned_ip6_frag **frag_hdr) + const struct ovs_16aligned_ip6_frag **frag_hdr, + const struct ip6_rt_hdr **rt_hdr) { - *frag_hdr = NULL; + if (frag_hdr) { + *frag_hdr = NULL; + } + + if (rt_hdr) { + *rt_hdr = NULL; + } + while (1) { if (OVS_LIKELY((*nw_proto != IPPROTO_HOPOPTS) && (*nw_proto != IPPROTO_ROUTING) @@ -504,7 +512,6 @@ parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, } if ((*nw_proto == IPPROTO_HOPOPTS) - || (*nw_proto == IPPROTO_ROUTING) || (*nw_proto == IPPROTO_DSTOPTS)) { /* These headers, while different, have the fields we care * about in the same location and with the same @@ -515,6 +522,18 @@ parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, (ext_hdr->ip6e_len + 1) * 8))) { return false; } + } else if (*nw_proto == IPPROTO_ROUTING) { + const struct ip6_rt_hdr *tmp; + if (!rt_hdr) { + rt_hdr = &tmp; + } + + *rt_hdr = *datap; + *nw_proto = (*rt_hdr)->nexthdr; + if (OVS_UNLIKELY(!data_try_pull(datap, sizep, + ((*rt_hdr)->hdrlen + 1) * 8))) { + return false; + } } else if (*nw_proto == IPPROTO_AH) { /* A standard AH definition isn't available, but the fields * we care about are in the same location as the generic @@ -527,6 +546,11 @@ parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, return false; } } else if (*nw_proto == IPPROTO_FRAGMENT) { + const struct ovs_16aligned_ip6_frag *tmp; + if (!frag_hdr) { + frag_hdr = &tmp; + } + *frag_hdr = *datap; *nw_proto = (*frag_hdr)->ip6f_nxt; @@ -561,15 +585,19 @@ parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, * has FLOW_NW_FRAG_LATER set. Both first and later fragments have * FLOW_NW_FRAG_ANY set in 'nw_frag'. * + * If a routing header is found, '*rt_hdr' is set to the routing + * header and otherwise set to NULL. + * * A return value of false indicates that there was a problem parsing * the extension headers.*/ bool parse_ipv6_ext_hdrs(const void **datap, size_t *sizep, uint8_t *nw_proto, uint8_t *nw_frag, - const struct ovs_16aligned_ip6_frag **frag_hdr) + const struct ovs_16aligned_ip6_frag **frag_hdr, + const struct ip6_rt_hdr **rt_hdr) { return parse_ipv6_ext_hdrs__(datap, sizep, nw_proto, nw_frag, - frag_hdr); + frag_hdr, rt_hdr); } bool @@ -945,9 +973,8 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst) nw_ttl = nh->ip6_hlim; nw_proto = nh->ip6_nxt; - const struct ovs_16aligned_ip6_frag *frag_hdr; - if (!parse_ipv6_ext_hdrs__(&data, &size, &nw_proto, &nw_frag, - &frag_hdr)) { + if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag, + NULL, NULL)) { goto out; } @@ -1200,10 +1227,9 @@ parse_tcp_flags(struct dp_packet *packet, plen = ntohs(nh->ip6_plen); /* Never pull padding. */ dp_packet_set_l2_pad_size(packet, size - plen); size = plen; - const struct ovs_16aligned_ip6_frag *frag_hdr; nw_proto = nh->ip6_nxt; - if (!parse_ipv6_ext_hdrs__(&data, &size, &nw_proto, &nw_frag, - &frag_hdr)) { + if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag, + NULL, NULL)) { return 0; } } else { diff --git a/lib/flow.h b/lib/flow.h index c647ad83c256..a9d026e1ce3b 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -132,7 +132,8 @@ void packet_expand(struct dp_packet *, const struct flow *, size_t size); bool parse_ipv6_ext_hdrs(const void **datap, size_t *sizep, uint8_t *nw_proto, uint8_t *nw_frag, - const struct ovs_16aligned_ip6_frag **frag_hdr); + const struct ovs_16aligned_ip6_frag **frag_hdr, + const struct ip6_rt_hdr **rt_hdr); bool parse_nsh(const void **datap, size_t *sizep, struct ovs_key_nsh *key); uint16_t parse_tcp_flags(struct dp_packet *packet, ovs_be16 *dl_type_p, uint8_t *nw_frag_p, ovs_be16 *first_vlan_tci_p); diff --git a/lib/ipf.c b/lib/ipf.c index d452663743c5..affd440f6387 100644 --- a/lib/ipf.c +++ b/lib/ipf.c @@ -485,9 +485,9 @@ ipf_reassemble_v6_frags(struct ipf_list *ipf_list) const void *data = l3 + 1; size_t datasize = pl; - const struct ovs_16aligned_ip6_frag *frag_hdr = NULL; - if (!parse_ipv6_ext_hdrs(&data, &datasize, &nw_proto, &nw_frag, &frag_hdr) - || !nw_frag || !frag_hdr) { + const struct ovs_16aligned_ip6_frag *frag_hdr; + if (!parse_ipv6_ext_hdrs(&data, &datasize, &nw_proto, &nw_frag, &frag_hdr, + NULL) || !nw_frag || !frag_hdr) { ipf_print_reass_packet("Unparsed reassembled v6 packet; v6 hdr:", l3); dp_packet_delete(pkt); @@ -678,9 +678,9 @@ ipf_is_valid_v6_frag(struct ipf *ipf, struct dp_packet *pkt) uint8_t nw_proto = l3->ip6_nxt; const void *data = l3 + 1; size_t datasize = l3_size - l3_hdr_size; - const struct ovs_16aligned_ip6_frag *frag_hdr = NULL; + const struct ovs_16aligned_ip6_frag *frag_hdr; if (!parse_ipv6_ext_hdrs(&data, &datasize, &nw_proto, &nw_frag, - &frag_hdr) || !nw_frag || !frag_hdr) { + &frag_hdr, NULL) || !nw_frag || !frag_hdr) { return false; } @@ -721,9 +721,10 @@ ipf_v6_key_extract(struct dp_packet *pkt, ovs_be16 dl_type, uint16_t zone, uint8_t nw_proto = l3->ip6_nxt; const void *data = l3 + 1; size_t datasize = dp_packet_l3_size(pkt) - sizeof *l3; - const struct ovs_16aligned_ip6_frag *frag_hdr = NULL; + const struct ovs_16aligned_ip6_frag *frag_hdr; - parse_ipv6_ext_hdrs(&data, &datasize, &nw_proto, &nw_frag, &frag_hdr); + parse_ipv6_ext_hdrs(&data, &datasize, &nw_proto, &nw_frag, &frag_hdr, + NULL); ovs_assert(nw_frag && frag_hdr); ovs_be16 ip6f_offlg = frag_hdr->ip6f_offlg; *start_data_byte = ntohs(ip6f_offlg & IP6F_OFF_MASK) + diff --git a/lib/packets.h b/lib/packets.h index 8626aac8d53f..70cd072228ae 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -988,6 +988,15 @@ struct ovs_16aligned_ip6_frag { ovs_16aligned_be32 ip6f_ident; }; +#define IP6_RT_HDR_LEN 4 +struct ip6_rt_hdr { + uint8_t nexthdr; + uint8_t hdrlen; + uint8_t type; + uint8_t segments_left; +}; +BUILD_ASSERT_DECL(IP6_RT_HDR_LEN == sizeof(struct ip6_rt_hdr)); + #define ICMP6_HEADER_LEN 4 struct icmp6_header { uint8_t icmp6_type; From patchwork Tue Mar 28 06:42:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 1762174 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.133; helo=smtp2.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=UDV/ja/a; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4Pm0Vz6l98z1yYV for ; Tue, 28 Mar 2023 17:43:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id C7ADF41776; Tue, 28 Mar 2023 06:43:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C7ADF41776 Authentication-Results: smtp2.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=UDV/ja/a X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J8XksnAxc0ow; Tue, 28 Mar 2023 06:42:58 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 1A36241590; Tue, 28 Mar 2023 06:42:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1A36241590 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A886EC0096; Tue, 28 Mar 2023 06:42:53 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7675DC0036 for ; Tue, 28 Mar 2023 06:42:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DC49F60ABD for ; Tue, 28 Mar 2023 06:42:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DC49F60ABD Authentication-Results: smtp3.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=UDV/ja/a 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 WnTukRAUCEDs for ; Tue, 28 Mar 2023 06:42:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9C67460E96 Received: from corp-ob07.yahoo-corp.jp (corp-ob07.yahoo-corp.jp [183.79.94.94]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9C67460E96 for ; Tue, 28 Mar 2023 06:42:45 +0000 (UTC) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01lp2105.outbound.protection.outlook.com [104.47.23.105]) by corp-ob07.yahoo-corp.jp (Postfix) with ESMTPS id 28F5C19FB185 for ; Tue, 28 Mar 2023 15:42:43 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XUYpWhpwJKKy4q9k8FcNLz9Ep/m1ZNAAsYqsKH43xKNLcVSQBLqTNXULg+d7KsfwEUW9hIstFfZDmTAWUauH8jnu0iRI6PQ07JmiwamK/7ll7lB/em2jzEaIgROf2bqRQ98RjwNtwKjlBbOTwxreT4FCwdmlTn8yPwUBi542mKZ1JuBXfSX2aAK1Mh89RZVdwZd+MDNmro8Wb5tbdqfm5VnmgJ7FbZ2zgiMHPLd6VqjdEIcsQ3qIzOIFXEk9cE3nQaoqoRKmaJ5/SrQIyqzU80pm1nWfdZnqgEfjkGUHlKu34CdKiyJhdbiHhDwSDd/6PyL4FFuQ3asonW1a1dQ2SA== 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=6dqDKEm8oqFfX/ucDjPn4PMPU4WcSroNyASRvu4LpKM=; b=QeFRAaLWldVQqKxpsNcevKUxNpchHpWw5pjnrGj+yPlhE5DebHH6dT9uNo/Bd1u6co6RuNAUiYfOM5OHkUGKTBCko7KhU6JerPifaSBL0RtGK8xv3bmrOT8oIFfiyd87wJ4Zm8SACRauiXCuT/DyfIzMQ/MUdOF4InmuHyK5qrxEE/ac1iovUDLwW6/viEchpIRv1mAZzh2FW9F/n/UjVk0XRSY/pqULReQGh/pTiBNpdiJ3bebPpkdUR4S+d5PuzRUaLt/qoFV3PXT15UGI3DfzhIJy6uKCWMqoqNnOha5zf0bKT/OeypM4zmpK58goFakJl8arg+gTttlUgCiAsQ== 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=6dqDKEm8oqFfX/ucDjPn4PMPU4WcSroNyASRvu4LpKM=; b=UDV/ja/aTRgu7+jweUAYZBjUR0aoOmtdP+BpTm6+MvUeymssu1iRhreOV3QSYs8Oxd6x9pKE5f5u/zUDa9ahMrU/s2H2Rw0KfWcqQQjDx6O3PoMn225CR8HAwIP1O+QP/ifoymNAvUa1X3pNPUo0EdvHuL3o4cAi+FwwL7zS90I= 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 OS7PR01MB11871.jpnprd01.prod.outlook.com (2603:1096:604:23d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.33; Tue, 28 Mar 2023 06:42:40 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1%4]) with mapi id 15.20.6222.030; Tue, 28 Mar 2023 06:42:40 +0000 From: Nobuhiro MIKI To: dev@openvswitch.org Date: Tue, 28 Mar 2023 15:42:22 +0900 Message-Id: <20230328064223.51144-5-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230328064223.51144-1-nmiki@yahoo-corp.jp> References: <20230328064223.51144-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYCP286CA0043.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::14) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|OS7PR01MB11871:EE_ X-MS-Office365-Filtering-Correlation-Id: e0810502-709f-4a2d-b5e8-08db2f57a041 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cu53Rk0Vl8hH5AE03h6fxDetZSQCIv0XYJSXNUwNjIpRQsi9c98mzzk+Mmxs/qemR+n11llQ1tRgSwOenB9EX/WgUTyOQv0YVPvZFvbwKiC0EXaw69ZTtX9125bqU7vGMtcR5Z1dD4aVW5OVj3xftfpOb/E8J7w9Pp0sSIBb1HXBZf5Dneh9Xk1l8DdSZmKy1VFGrno1WQkHzA5l+7LKPMJrrELHsKVIacSVCKbeDQX3ZvFGMtzKIFBPdFAiRVmJir5ruwp9kB7HK8wdTP0bM/Fp6FIs00x0IFRk6zd62ZHSsaDLeFX8k8tHmZpGkZbdDfFf0jTSIOTHYIRkc7LBL/OhD7dh1u7kTl2ubTI0JeJjuq/SKdSt0ttanxeYr8M02GY6HIIUtE/egH3oDMotcqFyegzw4vtFcDGis2aa9JuX7imA4A+3HEn1PyX6k/CtbVjCrcJ/vgqxTAdxJ5R23z14vDP4ESxT1nxb/o+h71Fq1KXj3E78XXdq+5raX5Hk0XORC3mHsWlXApfok7oidBWpCMVwAS65QQzTKMTYlCYqlD4/2kHSvoX66qSViyH58NzoifHl9nKKbCdL3FW10p2VrltSrOixW+0o/w6X49y8/7W4EhgkfLhRExMXeo76 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)(396003)(346002)(366004)(39860400002)(136003)(376002)(451199021)(38350700002)(86362001)(36756003)(2906002)(107886003)(478600001)(966005)(6666004)(6486002)(2616005)(6512007)(52116002)(38100700002)(83380400001)(316002)(4326008)(6916009)(5660300002)(8676002)(66556008)(66476007)(66946007)(82960400001)(6506007)(186003)(1076003)(26005)(8936002)(30864003)(41300700001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZuNwTudXr7Jl+ijHZDFsW6exhxbmpkhN08P04bS5CW0DFsN0LY7ZjpmcpyIh6cZkAByjOQ/iDPTmj025mB6QWbtLRk1khwHg6UUDWp7Dj6dHCbqbkviova4yUeJarMVB7mNh1/WrTh2dvgyo9MIyAMTmnLD5V20pRnPGOtjJECyTHnKrT7/5toK7aKt81ZT1i6+YwEAWoLOgnFgExHMbPbDMN5i7ZjxcCShB+v9GkcNcMJkPRFtUa9L+soPMiYJcdMTstFgE0wi2qCfTeMs1OGP6d3QG11JB5ZdGf8sQ+KKtYfMYCXX+BBJICYDqd+Qkfi2wRSjDbhY5jQsnMAgHL7FxxI6K5fBUjs2m9a/nQfWyIz44WFHdbY50NoSk93j1BqrDhgLzEhUNW1tsjsBGUEj9MSZzLDCmeLbDFgkgCYuEMg14/I4Us+Uq5wje6pwmSFCI7wRxBdLGYqezYeND0GfbgkNkVvq5/VPw+0D/ioJFPH/d/bYSA4hqXdFtqNnRKvDFwNtp9Q6fTeE9wVxaIwsgpReG0pC6MkTNOkHTkbm4D1BsLUuyEDyM2nDbpUac3JisXG7FSCM6eALudK3ZOqDX2fGd/reeoTY7XWtTl00XLt6c/96ATfMRE4FXTBR7zQK6ENUkL2u1ETCOhE4MZMqXPylbPfdXhqijf4d4c/9aCXd0pGsUkqr+MaUvImZzg0FALa8fuApG5R9OvX1mySsgVe3A0rfeYuQ3SFcUZlEYJLCbkrb47z/b+JB6nYuvkU5yRqIrCbwCAmiWJSNVt/0lrDqglUkLCu14I45C+U/bIlTNivkLMdZBuJIxuMk9SKlwK9us/ZPLq1ENiEAayNTB84GkqOQFFjGUwX9XDPiKJNQx5olQ32SWvrJplxrCar5xjdpmJ1OZkcMUmaFQZ+h7VZZyZz3QOGXLvRAroDq9iEnSFOgcl4MnfsUA07/hJZs3HTXyqrFHBp3SHASkHUUURtO58sBC/8b1Sl4iNI6LelqFfSq89aLX2EXDwexvk63MrDM0ja/THsKf7Y93NHAX2yuDuS3qXlkJYAaAGV3lETlblKvmlMjZG9pD1xdyECItzqZMd7mZoFxEb+9Q/EakPJkT40eZ9vstIdvamkcgX7BjFaP4mmwUT7K9TYdMV0EiFON4iryl/iPIGY3uR3HGtVdfS2JKFK8uCsmd8pg1foh1fyZZ2AmQYFS5/inaX5FZyS4d0MdMKSD440YbxXiVuXw4/idI7XAD0kj8lEo/GQhhPgNDOztushA3T+0FCc7soPTT6wVgoju7Rgv2SX2FiJv9TrZK4ORdBCwxLiq89BrWsWMULvhi3aImXhqfkCpbE9HrPwhZd7tIiBnbHl9X4unrTUlUw8guK/zeJdY/ov4HLiOvAxTYMABCwyGjC+Fhnai3Yll/CBeh4oO0SXvxq5blMeTiGxNBgcpLUtgQx9rQp9dU3qP/4YzMV5gsNP64vDfKvUWpucTniM4w78J0lzn+p1dEVMbzbsa8Zhlqzo8puOBShkQVoZjrvivjaMyhOqy64Veuh4JzYs1nUk+/2FtjEMUmouelK22dxPYzMjNv9oLR2j8PEiKlGZFX X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: e0810502-709f-4a2d-b5e8-08db2f57a041 X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2023 06:42:40.2500 (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: GUB7c6NgOgSauhJ+KuG6UjyXZyT6TpRR2MPvkJfh9dSqwvkEWoLKM0vWRM/zGBxLaaiKzHDz5OHwxtXU6B/YjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11871 Subject: [ovs-dev] [PATCH v11 4/5] userspace: Add SRv6 tunnel support. 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" SRv6 (Segment Routing IPv6) tunnel vport is responsible for encapsulation and decapsulation the inner packets with IPv6 header and an extended header called SRH (Segment Routing Header). See spec in: https://datatracker.ietf.org/doc/html/rfc8754 This patch implements SRv6 tunneling in userspace datapath. It uses `remote_ip` and `local_ip` options as with existing tunnel protocols. It also adds a dedicated `srv6_segs` option to define a sequence of routers called segment list. Signed-off-by: Nobuhiro MIKI --- Documentation/faq/configuration.rst | 21 +++++ Documentation/faq/releases.rst | 1 + NEWS | 2 + include/linux/openvswitch.h | 1 + include/sparse/netinet/in.h | 1 + lib/dpif-netlink-rtnl.c | 5 ++ lib/dpif-netlink.c | 5 ++ lib/netdev-native-tnl.c | 127 ++++++++++++++++++++++++++++ lib/netdev-native-tnl.h | 10 +++ lib/netdev-vport.c | 53 ++++++++++++ lib/netdev.h | 4 + lib/packets.h | 11 +++ lib/tnl-ports.c | 5 +- ofproto/ofproto-dpif-xlate.c | 3 + tests/system-kmod-macros.at | 8 ++ tests/system-traffic.at | 119 ++++++++++++++++++++++++++ tests/system-userspace-macros.at | 6 ++ tests/tunnel.at | 56 ++++++++++++ 18 files changed, 437 insertions(+), 1 deletion(-) diff --git a/Documentation/faq/configuration.rst b/Documentation/faq/configuration.rst index dc6c92446f98..4df390dc2d9d 100644 --- a/Documentation/faq/configuration.rst +++ b/Documentation/faq/configuration.rst @@ -238,6 +238,27 @@ Q: Does Open vSwitch support GTP-U? set int gtpu0 type=gtpu options:key= \ options:remote_ip=172.31.1.1 +Q: Does Open vSwitch support SRv6? + + A: Yes. Starting with version 3.2, the Open vSwitch userspace + datapath supports SRv6 (Segment Routing over IPv6). The following + example shows tunneling to fc00:300::1 via fc00:100::1 and fc00:200::1. + In the current implementation, if "IPv6 in IPv6" or "IPv4 in IPv6" packets + are routed to this interface, and these packets are not SRv6 packets, they + may be dropped, so be careful in workloads with a mix of these tunnels. + Also note the following restrictions: + + * Segment list length is limited to 6. + * SRv6 packets with other than segments_left = 0 are simply dropped. + + :: + + $ ovs-vsctl add-br br0 + $ ovs-vsctl add-port br0 srv6_0 -- \ + set int srv6_0 type=srv6 \ + options:remote_ip=fc00:100::1 \ + options:srv6_segs="fc00:100::1,fc00:200::1,fc00:300::1" + Q: How do I connect two bridges? A: First, why do you want to do this? Two connected bridges are not much diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst index 9e1b42262000..9fb679e307d9 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -151,6 +151,7 @@ Q: Are all features available with all datapaths? Tunnel - ERSPAN 4.18 2.10 2.10 NO Tunnel - ERSPAN-IPv6 4.18 2.10 2.10 NO Tunnel - GTP-U NO NO 2.14 NO + Tunnel - SRv6 NO NO 3.2 NO Tunnel - Bareudp 5.7 NO NO NO QoS - Policing YES 1.1 2.6 NO QoS - Shaping YES 1.1 NO NO diff --git a/NEWS b/NEWS index 8771ee618aed..a8d77a75a248 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,8 @@ Post-v3.1.0 * ovs-vswitchd will keep the CAP_SYS_RAWIO capability when started with the --hw-rawio-access command line option. This allows the process extra privileges when mapping physical interconnect memory. + - SRv6 Tunnel Protocol + * Only support for userspace datapath. v3.1.0 - 16 Feb 2023 diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h index bc8f74991849..e305c331516b 100644 --- a/include/linux/openvswitch.h +++ b/include/linux/openvswitch.h @@ -254,6 +254,7 @@ enum ovs_vport_type { OVS_VPORT_TYPE_IP6GRE = 109, OVS_VPORT_TYPE_GTPU = 110, OVS_VPORT_TYPE_BAREUDP = 111, /* Bareudp tunnel. */ + OVS_VPORT_TYPE_SRV6 = 112, /* SRv6 tunnel. */ __OVS_VPORT_TYPE_MAX }; diff --git a/include/sparse/netinet/in.h b/include/sparse/netinet/in.h index 21deceb28d41..00927281643a 100644 --- a/include/sparse/netinet/in.h +++ b/include/sparse/netinet/in.h @@ -68,6 +68,7 @@ struct sockaddr_in6 { #define IPPROTO_HOPOPTS 0 #define IPPROTO_ICMP 1 #define IPPROTO_IGMP 2 +#define IPPROTO_IPIP 4 #define IPPROTO_TCP 6 #define IPPROTO_UDP 17 #define IPPROTO_ROUTING 43 diff --git a/lib/dpif-netlink-rtnl.c b/lib/dpif-netlink-rtnl.c index 4fc42daed2d9..5788294ae0d7 100644 --- a/lib/dpif-netlink-rtnl.c +++ b/lib/dpif-netlink-rtnl.c @@ -129,6 +129,8 @@ vport_type_to_kind(enum ovs_vport_type type, } case OVS_VPORT_TYPE_GTPU: return NULL; + case OVS_VPORT_TYPE_SRV6: + return "srv6"; case OVS_VPORT_TYPE_BAREUDP: return "bareudp"; case OVS_VPORT_TYPE_NETDEV: @@ -319,6 +321,7 @@ dpif_netlink_rtnl_verify(const struct netdev_tunnel_config *tnl_cfg, case OVS_VPORT_TYPE_LISP: case OVS_VPORT_TYPE_STT: case OVS_VPORT_TYPE_GTPU: + case OVS_VPORT_TYPE_SRV6: case OVS_VPORT_TYPE_UNSPEC: case __OVS_VPORT_TYPE_MAX: default: @@ -411,6 +414,7 @@ dpif_netlink_rtnl_create(const struct netdev_tunnel_config *tnl_cfg, case OVS_VPORT_TYPE_LISP: case OVS_VPORT_TYPE_STT: case OVS_VPORT_TYPE_GTPU: + case OVS_VPORT_TYPE_SRV6: case OVS_VPORT_TYPE_UNSPEC: case __OVS_VPORT_TYPE_MAX: default: @@ -519,6 +523,7 @@ dpif_netlink_rtnl_port_destroy(const char *name, const char *type) case OVS_VPORT_TYPE_ERSPAN: case OVS_VPORT_TYPE_IP6ERSPAN: case OVS_VPORT_TYPE_IP6GRE: + case OVS_VPORT_TYPE_SRV6: case OVS_VPORT_TYPE_BAREUDP: return dpif_netlink_rtnl_destroy(name); case OVS_VPORT_TYPE_NETDEV: diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index ebe7b5cb1452..55b5b0a8549a 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -919,6 +919,9 @@ get_vport_type(const struct dpif_netlink_vport *vport) case OVS_VPORT_TYPE_GTPU: return "gtpu"; + case OVS_VPORT_TYPE_SRV6: + return "srv6"; + case OVS_VPORT_TYPE_BAREUDP: return "bareudp"; @@ -957,6 +960,8 @@ netdev_to_ovs_vport_type(const char *type) return OVS_VPORT_TYPE_GRE; } else if (!strcmp(type, "gtpu")) { return OVS_VPORT_TYPE_GTPU; + } else if (!strcmp(type, "srv6")) { + return OVS_VPORT_TYPE_SRV6; } else if (!strcmp(type, "bareudp")) { return OVS_VPORT_TYPE_BAREUDP; } else { diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index b89dfdd52a86..7d40c40738de 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -845,6 +845,133 @@ netdev_gtpu_build_header(const struct netdev *netdev, return 0; } +int +netdev_srv6_build_header(const struct netdev *netdev, + struct ovs_action_push_tnl *data, + const struct netdev_tnl_build_header_params *params) +{ + struct netdev_vport *dev = netdev_vport_cast(netdev); + struct netdev_tunnel_config *tnl_cfg; + const struct in6_addr *segs; + struct srv6_base_hdr *srh; + struct in6_addr *s; + ovs_be16 dl_type; + int err = 0; + int nr_segs; + int i; + + ovs_mutex_lock(&dev->mutex); + tnl_cfg = &dev->tnl_cfg; + + if (tnl_cfg->srv6_num_segs) { + nr_segs = tnl_cfg->srv6_num_segs; + segs = tnl_cfg->srv6_segs; + } else { + /* + * If explicit segment list setting is omitted, tunnel destination + * is considered to be the first segment list. + */ + nr_segs = 1; + segs = ¶ms->flow->tunnel.ipv6_dst; + } + + if (!ipv6_addr_equals(&segs[0], ¶ms->flow->tunnel.ipv6_dst)) { + err = EINVAL; + goto out; + } + + srh = netdev_tnl_ip_build_header(data, params, IPPROTO_ROUTING); + srh->rt_hdr.segments_left = nr_segs - 1; + srh->rt_hdr.type = IPV6_SRCRT_TYPE_4; + srh->rt_hdr.hdrlen = 2 * nr_segs; + srh->last_entry = nr_segs - 1; + srh->flags = 0; + srh->tag = 0; + + dl_type = params->flow->dl_type; + if (dl_type == htons(ETH_TYPE_IP)) { + srh->rt_hdr.nexthdr = IPPROTO_IPIP; + } else if (dl_type == htons(ETH_TYPE_IPV6)) { + srh->rt_hdr.nexthdr = IPPROTO_IPV6; + } + + s = ALIGNED_CAST(struct in6_addr *, + (char *) srh + sizeof *srh); + for (i = 0; i < nr_segs; i++) { + /* Segment list is written to the header in reverse order. */ + memcpy(s, &segs[nr_segs - i - 1], sizeof *s); + s++; + } + + data->header_len += sizeof *srh + 8 * srh->rt_hdr.hdrlen; + data->tnl_type = OVS_VPORT_TYPE_SRV6; +out: + ovs_mutex_unlock(&dev->mutex); + + return err; +} + +void +netdev_srv6_push_header(const struct netdev *netdev OVS_UNUSED, + struct dp_packet *packet OVS_UNUSED, + const struct ovs_action_push_tnl *data OVS_UNUSED) +{ + int ip_tot_size; + + netdev_tnl_push_ip_header(packet, data->header, + data->header_len, &ip_tot_size); +} + +struct dp_packet * +netdev_srv6_pop_header(struct dp_packet *packet) +{ + const struct ovs_16aligned_ip6_hdr *nh = dp_packet_l3(packet); + size_t size = dp_packet_l3_size(packet) - IPV6_HEADER_LEN; + struct pkt_metadata *md = &packet->md; + struct flow_tnl *tnl = &md->tunnel; + const struct ip6_rt_hdr *rt_hdr; + uint8_t nw_proto = nh->ip6_nxt; + const void *data = nh + 1; + uint8_t nw_frag = 0; + unsigned int hlen; + + /* + * Verifies that the routing header is present in the IPv6 + * extension headers and that its type is SRv6. + */ + if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag, + NULL, &rt_hdr)) { + goto err; + } + + if (!rt_hdr || rt_hdr->type != IPV6_SRCRT_TYPE_4) { + goto err; + } + + if (rt_hdr->segments_left > 0) { + VLOG_WARN_RL(&err_rl, "invalid srv6 segments_left=%d\n", + rt_hdr->segments_left); + goto err; + } + + if (rt_hdr->nexthdr == IPPROTO_IPIP) { + packet->packet_type = htonl(PT_IPV4); + } else if (rt_hdr->nexthdr == IPPROTO_IPV6) { + packet->packet_type = htonl(PT_IPV6); + } else { + goto err; + } + + pkt_metadata_init_tnl(md); + netdev_tnl_ip_extract_tnl_md(packet, tnl, &hlen); + dp_packet_reset_packet(packet, hlen); + + return packet; +err: + dp_packet_delete(packet); + return NULL; +} + struct dp_packet * netdev_vxlan_pop_header(struct dp_packet *packet) { diff --git a/lib/netdev-native-tnl.h b/lib/netdev-native-tnl.h index 22ae2ce5369b..4dad8f978cc6 100644 --- a/lib/netdev-native-tnl.h +++ b/lib/netdev-native-tnl.h @@ -65,6 +65,16 @@ netdev_gtpu_build_header(const struct netdev *netdev, struct ovs_action_push_tnl *data, const struct netdev_tnl_build_header_params *p); +struct dp_packet *netdev_srv6_pop_header(struct dp_packet *); + +void netdev_srv6_push_header(const struct netdev *, + struct dp_packet *, + const struct ovs_action_push_tnl *); + +int netdev_srv6_build_header(const struct netdev *, + struct ovs_action_push_tnl *, + const struct netdev_tnl_build_header_params *); + void netdev_tnl_push_udp_header(const struct netdev *netdev, struct dp_packet *packet, diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 3b39278650d3..663ee8606c3b 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -424,6 +424,35 @@ parse_tunnel_ip(const char *value, bool accept_mcast, bool *flow, return 0; } +static int +parse_srv6_segs(char *s, struct in6_addr *segs, uint8_t *num_segs) +{ + char *save_ptr = NULL; + char *token; + + if (!s) { + return EINVAL; + } + + *num_segs = 0; + + while ((token = strtok_r(s, ",", &save_ptr)) != NULL) { + if (*num_segs == SRV6_MAX_SEGS) { + return EINVAL; + } + + if (inet_pton(AF_INET6, token, segs) != 1) { + return EINVAL; + } + + segs++; + (*num_segs)++; + s = NULL; + } + + return 0; +} + enum tunnel_layers { TNL_L2 = 1 << 0, /* 1 if a tunnel type can carry Ethernet traffic. */ TNL_L3 = 1 << 1 /* 1 if a tunnel type can carry L3 traffic. */ @@ -443,6 +472,8 @@ tunnel_supported_layers(const char *type, return TNL_L3; } else if (!strcmp(type, "bareudp")) { return TNL_L3; + } else if (!strcmp(type, "srv6")) { + return TNL_L3; } else { return TNL_L2; } @@ -750,6 +781,17 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args, char **errp) goto out; } } + } else if (!strcmp(node->key, "srv6_segs")) { + err = parse_srv6_segs(node->value, + tnl_cfg.srv6_segs, + &tnl_cfg.srv6_num_segs); + + switch (err) { + case EINVAL: + ds_put_format(&errors, "%s: bad %s 'srv6_segs'\n", + name, node->value); + break; + } } else if (!strcmp(node->key, "payload_type")) { if (!strcmp(node->value, "mpls")) { tnl_cfg.payload_ethertype = htons(ETH_TYPE_MPLS); @@ -1290,6 +1332,17 @@ netdev_vport_tunnel_register(void) }, {{NULL, NULL, 0, 0}} }, + { "srv6_sys", + { + TUNNEL_FUNCTIONS_COMMON, + .type = "srv6", + .build_header = netdev_srv6_build_header, + .push_header = netdev_srv6_push_header, + .pop_header = netdev_srv6_pop_header, + .get_ifindex = NETDEV_VPORT_GET_IFINDEX, + }, + {{NULL, NULL, 0, 0}} + }, }; static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; diff --git a/lib/netdev.h b/lib/netdev.h index acf174927d24..ff207f56c28c 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -140,6 +140,10 @@ struct netdev_tunnel_config { bool erspan_idx_flow; bool erspan_dir_flow; bool erspan_hwid_flow; + + uint8_t srv6_num_segs; + #define SRV6_MAX_SEGS 6 + struct in6_addr srv6_segs[SRV6_MAX_SEGS]; }; void netdev_run(void); diff --git a/lib/packets.h b/lib/packets.h index 70cd072228ae..83e0f6d95f36 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -1523,6 +1523,17 @@ BUILD_ASSERT_DECL(sizeof(struct vxlanhdr) == 8); #define VXLAN_F_GPE 0x4000 #define VXLAN_HF_GPE 0x04000000 +/* SRv6 protocol header. */ +#define IPV6_SRCRT_TYPE_4 4 +#define SRV6_BASE_HDR_LEN 8 +struct srv6_base_hdr { + struct ip6_rt_hdr rt_hdr; + uint8_t last_entry; + uint8_t flags; + ovs_be16 tag; +}; +BUILD_ASSERT_DECL(sizeof(struct srv6_base_hdr) == SRV6_BASE_HDR_LEN); + /* Input values for PACKET_TYPE macros have to be in host byte order. * The _BE postfix indicates result is in network byte order. Otherwise result * is in host byte order. */ diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c index 829457ee50f0..f16409a0bf08 100644 --- a/lib/tnl-ports.c +++ b/lib/tnl-ports.c @@ -126,7 +126,7 @@ map_insert(odp_port_t port, struct eth_addr mac, struct in6_addr *addr, /* XXX: No fragments support. */ match.wc.masks.nw_frag = FLOW_NW_FRAG_MASK; - /* 'tp_port' is zero for GRE tunnels. In this case it + /* 'tp_port' is zero for GRE and SRv6 tunnels. In this case it * doesn't make sense to match on UDP port numbers. */ if (tp_port) { match.wc.masks.tp_dst = OVS_BE16_MAX; @@ -174,6 +174,9 @@ tnl_type_to_nw_proto(const char type[], uint8_t nw_protos[2]) } else if (!strcmp(type, "gre") || !strcmp(type, "erspan") || !strcmp(type, "ip6erspan") || !strcmp(type, "ip6gre")) { nw_protos[0] = IPPROTO_GRE; + } else if (!strcmp(type, "srv6")) { + nw_protos[0] = IPPROTO_IPIP; + nw_protos[1] = IPPROTO_IPV6; } } diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index a9cf3cbee0be..15c814d6285b 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -3632,6 +3632,9 @@ propagate_tunnel_data_to_flow(struct xlate_ctx *ctx, struct eth_addr dmac, case OVS_VPORT_TYPE_BAREUDP: nw_proto = IPPROTO_UDP; break; + case OVS_VPORT_TYPE_SRV6: + nw_proto = IPPROTO_IPIP; + break; case OVS_VPORT_TYPE_LISP: case OVS_VPORT_TYPE_STT: case OVS_VPORT_TYPE_UNSPEC: diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 822a80618d6f..fb15a5a7ce03 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -202,6 +202,14 @@ m4_define([OVS_CHECK_KERNEL_EXCL], AT_SKIP_IF([ ! ( test $version -lt $1 || ( test $version -eq $1 && test $sublevel -lt $2 ) || test $version -gt $3 || ( test $version -eq $3 && test $sublevel -gt $4 ) ) ]) ]) +# OVS_CHECK_SRV6() +# +# The kernel datapath does not support this feature. +m4_define([OVS_CHECK_SRV6], +[ + AT_SKIP_IF([:]) +]) + # CHECK_LATER_IPV6_FRAGMENTS() # # Upstream kernels beetween 4.20 and 5.19 are not parsing IPv6 fragments diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 39a48175271e..65bae736f00e 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -1164,6 +1164,125 @@ OVS_WAIT_UNTIL([cat p0.pcap | grep -E "IP6 fc00:100::100 > fc00:100::1: GREv0, . OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([datapath - ping over srv6 tunnel]) +OVS_CHECK_TUNNEL_TSO() +OVS_CHECK_SRV6() + +OVS_TRAFFIC_VSWITCHD_START() + +ADD_NAMESPACES(at_ns0) +ADD_NAMESPACES(at_ns1) +NS_EXEC([at_ns0], [sysctl -w net.ipv6.conf.default.seg6_enabled=1]) +NS_EXEC([at_ns0], [sysctl -w net.ipv4.conf.default.forwarding=1]) +NS_EXEC([at_ns0], [sysctl -w net.ipv6.conf.default.forwarding=1]) +NS_EXEC([at_ns0], [sysctl -w net.ipv6.conf.all.seg6_enabled=1]) +NS_EXEC([at_ns0], [sysctl -w net.ipv4.conf.all.forwarding=1]) +NS_EXEC([at_ns0], [sysctl -w net.ipv6.conf.all.forwarding=1]) + +dnl Set up underlay link from host into the namespace 'at_ns0' +dnl using veth pair. Kernel side tunnel endpoint (SID) is +dnl 'fc00:a::1/128', so add it to the route. +ADD_BR([br-underlay]) +ADD_VETH(p0, at_ns0, br-underlay, "fc00::1/64", [], [], "nodad") +AT_CHECK([ovs-ofctl add-flow br-underlay "actions=normal"]) +AT_CHECK([ip addr add dev br-underlay "fc00::100/64" nodad]) +AT_CHECK([ip link set dev br-underlay up]) +AT_CHECK([ip route add fc00:a::1/128 dev br-underlay via fc00::1]) + +dnl Set up tunnel endpoints on OVS outside the namespace. +ADD_OVS_TUNNEL6([srv6], [br0], [at_srv6], [fc00:a::1], [10.100.100.100/24]) +AT_CHECK([ovs-vsctl set bridge br0 other_config:hwaddr=aa:55:aa:55:00:00]) +AT_CHECK([ip route add 10.1.1.0/24 dev br0 via 10.100.100.1]) +AT_CHECK([arp -s 10.100.100.1 aa:55:aa:55:00:01]) +AT_CHECK([ovs-ofctl add-flow br0 in_port=LOCAL,actions=output:at_srv6]) +AT_CHECK([ovs-ofctl add-flow br0 in_port=at_srv6,actions=mod_dl_dst:aa:55:aa:55:00:00,output:LOCAL]) + +dnl Set up tunnel endpoints on the namespace 'at_ns0', +dnl and overlay port on the namespace 'at_ns1' +ADD_VETH_NS([at_ns0], [veth0], [10.1.1.2/24], [at_ns1], [veth1], [10.1.1.1/24]) +NS_CHECK_EXEC([at_ns0], [ip sr tunsrc set fc00:a::1]) +NS_CHECK_EXEC([at_ns0], [ip route add 10.100.100.0/24 encap seg6 mode encap segs fc00::100 dev p0]) +NS_CHECK_EXEC([at_ns0], [ip -6 route add fc00:a::1 encap seg6local action End.DX4 nh4 0.0.0.0 dev veth0]) +NS_CHECK_EXEC([at_ns1], [ip route add 10.100.100.0/24 via 10.1.1.2 dev veth1]) + +dnl Linux seems to take a little time to get its IPv6 stack in order. Without +dnl waiting, we get occasional failures due to the following error: +dnl "connect: Cannot assign requested address" +OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::100]) + +dnl First, check the underlay. +NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -w 2 fc00::100 | FORMAT_PING], [0], [dnl +3 packets transmitted, 3 received, 0% packet loss, time 0ms +]) + +dnl Okay, now check the overlay. +NS_CHECK_EXEC([at_ns1], [ping -q -c 3 -i 0.3 -w 2 10.100.100.100 | FORMAT_PING], [0], [dnl +3 packets transmitted, 3 received, 0% packet loss, time 0ms +]) + +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([datapath - ping6 over srv6 tunnel]) +OVS_CHECK_TUNNEL_TSO() +OVS_CHECK_SRV6() + +OVS_TRAFFIC_VSWITCHD_START() + +ADD_NAMESPACES(at_ns0) +ADD_NAMESPACES(at_ns1) +NS_EXEC([at_ns0], [sysctl -w net.ipv6.conf.default.seg6_enabled=1]) +NS_EXEC([at_ns0], [sysctl -w net.ipv6.conf.default.forwarding=1]) +NS_EXEC([at_ns0], [sysctl -w net.ipv6.conf.all.seg6_enabled=1]) +NS_EXEC([at_ns0], [sysctl -w net.ipv6.conf.all.forwarding=1]) + +dnl Set up underlay link from host into the namespace 'at_ns0' +dnl using veth pair. Kernel side tunnel endpoint (SID) is +dnl 'fc00:a::1/128', so add it to the route. +ADD_BR([br-underlay]) +ADD_VETH(p0, at_ns0, br-underlay, "fc00::1/64", [], [], "nodad") +AT_CHECK([ovs-ofctl add-flow br-underlay "actions=normal"]) +AT_CHECK([ip addr add dev br-underlay "fc00::100/64" nodad]) +AT_CHECK([ip link set dev br-underlay up]) +AT_CHECK([ip -6 route add fc00:a::1/128 dev br-underlay via fc00::1]) + +dnl Set up tunnel endpoints on OVS outside the namespace. +ADD_OVS_TUNNEL6([srv6], [br0], [at_srv6], [fc00:a::1], [fc00:100::100/64]) +AT_CHECK([ovs-vsctl set bridge br0 other_config:hwaddr=aa:55:aa:55:00:00]) +dnl [sleep infinity] +AT_CHECK([ip addr add dev br0 fc00:100::100/64]) +AT_CHECK([ip -6 route add fc00:1::1/128 dev br0 via fc00:100::1]) +AT_CHECK([ip -6 neigh add fc00:100::1 lladdr aa:55:aa:55:00:01 dev br0]) +AT_CHECK([ovs-ofctl add-flow br0 in_port=LOCAL,actions=output:at_srv6]) +AT_CHECK([ovs-ofctl add-flow br0 in_port=at_srv6,actions=mod_dl_dst:aa:55:aa:55:00:00,output:LOCAL]) + +dnl Set up tunnel endpoints on the namespace 'at_ns0', +dnl and overlay port on the namespace 'at_ns1' +ADD_VETH_NS([at_ns0], [veth0], [fc00:1::2/64], [at_ns1], [veth1], [fc00:1::1/64]) +NS_CHECK_EXEC([at_ns0], [ip sr tunsrc set fc00:a::1]) +NS_CHECK_EXEC([at_ns0], [ip -6 route add fc00:100::0/64 encap seg6 mode encap segs fc00::100 dev p0]) +NS_CHECK_EXEC([at_ns0], [ip -6 route add fc00:a::1 encap seg6local action End.DX6 nh6 :: dev veth0]) +NS_CHECK_EXEC([at_ns1], [ip -6 route add fc00:100::/64 via fc00:1::2 dev veth1]) + +dnl Linux seems to take a little time to get its IPv6 stack in order. Without +dnl waiting, we get occasional failures due to the following error: +dnl "connect: Cannot assign requested address" +OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::100]) +OVS_WAIT_UNTIL([ip netns exec at_ns1 ping6 -c 1 fc00:100::100]) + +dnl First, check the underlay. +NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -w 2 fc00::100 | FORMAT_PING], [0], [dnl +3 packets transmitted, 3 received, 0% packet loss, time 0ms +]) + +dnl Okay, now check the overlay. +NS_CHECK_EXEC([at_ns1], [ping6 -q -c 3 -i 0.3 -w 2 fc00:100::100 | FORMAT_PING], [0], [dnl +3 packets transmitted, 3 received, 0% packet loss, time 0ms +]) + +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP + AT_SETUP([datapath - clone action]) OVS_TRAFFIC_VSWITCHD_START() diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index 610fa2e94ae8..482079386a43 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -301,6 +301,12 @@ m4_define([OVS_CHECK_KERNEL_EXCL], AT_SKIP_IF([:]) ]) +# OVS_CHECK_SRV6() +m4_define([OVS_CHECK_SRV6], + [AT_SKIP_IF([! ip -6 route add fc00::1/96 encap seg6 mode encap dev lo 2>&1 >/dev/null]) + AT_CHECK([ip -6 route del fc00::1/96 2>&1 >/dev/null]) + OVS_CHECK_FIREWALL()]) + # CHECK_LATER_IPV6_FRAGMENTS() # # Userspace is parsing later IPv6 fragments correctly. diff --git a/tests/tunnel.at b/tests/tunnel.at index 78cc3f3e99a6..ddeb66bc9fb7 100644 --- a/tests/tunnel.at +++ b/tests/tunnel.at @@ -1223,3 +1223,59 @@ AT_CHECK([ovs-vsctl add-port br0 p1 -- set int p1 type=dummy]) OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) OVS_APP_EXIT_AND_WAIT([ovsdb-server])] AT_CLEANUP + +AT_SETUP([tunnel - SRV6 basic]) +OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=dummy \ + ofport_request=1 \ + -- add-port br0 p2 -- set Interface p2 type=srv6 \ + options:remote_ip=flow \ + ofport_request=2]) +OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP + +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 fc00::1/64], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/add fc00::0/64 br0], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/show], [0], [dnl +Route Table: +User: fc00::/64 dev br0 SRC fc00::1 +]) + +AT_DATA([flows.txt], [dnl +in_port=1,actions=set_field:fc00::2->tun_ipv6_dst,output:2 +in_port=2,actions=1 +]) +AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) + +AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl + br0 65534/100: (dummy-internal) + p1 1/1: (dummy) + p2 2/6: (srv6: remote_ip=flow) +]) + +AT_CHECK([ovs-appctl tnl/ports/show |sort], [0], [dnl +Listening ports: +srv6_sys (6) ref_cnt=1 +srv6_sys (6) ref_cnt=1 +]) + +AT_CHECK([ovs-appctl ofproto/list-tunnels], [0], [dnl +port 6: p2 (srv6: ::->flow, key=0, legacy_l3, dp port=6, ttl=64) +]) + +dnl Encap: ipv4 inner packet +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: set(tunnel(ipv6_dst=fc00::2,ttl=64,flags(df))),pop_eth,6 +]) + +dnl Encap: ipv6 inner packet +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x86dd),ipv6(src=2001:cafe::92,dst=2001:cafe::88,label=0,proto=47,tclass=0x0,hlimit=64)'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: set(tunnel(ipv6_dst=fc00::2,ttl=64,flags(df))),pop_eth,6 +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP From patchwork Tue Mar 28 06:42:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 1762173 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.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=mwZUFANp; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.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 4Pm0Vr4BXVz1yYV for ; Tue, 28 Mar 2023 17:43:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E83FB821FC; Tue, 28 Mar 2023 06:42:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E83FB821FC 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=mwZUFANp 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 uqqYbNuFkG5R; Tue, 28 Mar 2023 06:42:56 +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 0D039821C8; Tue, 28 Mar 2023 06:42:54 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0D039821C8 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7836AC0093; Tue, 28 Mar 2023 06:42:52 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 848F9C007A for ; Tue, 28 Mar 2023 06:42:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 59F4C61139 for ; Tue, 28 Mar 2023 06:42:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 59F4C61139 Authentication-Results: smtp3.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=mwZUFANp 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 86rFk3blpHtq for ; Tue, 28 Mar 2023 06:42:45 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F1FA360ABD Received: from corp-ob07.yahoo-corp.jp (corp-ob07.yahoo-corp.jp [183.79.94.94]) by smtp3.osuosl.org (Postfix) with ESMTPS id F1FA360ABD for ; Tue, 28 Mar 2023 06:42:44 +0000 (UTC) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01lp2105.outbound.protection.outlook.com [104.47.23.105]) by corp-ob07.yahoo-corp.jp (Postfix) with ESMTPS id 3E65419FB186 for ; Tue, 28 Mar 2023 15:42:43 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jciZthTZkRpyrhWhMZ3LtvxbPCRRRLo4xd3bUClVHEEwqjYt37WWsE3l+xktVOUHVEjSTItymroSTifP2M34aNEz7VTA5Eg4V6n2FUzZ2NEpRpXxgp5jAOSqvI1GIpiADHIZETe3qWhahXuVkFLViy76Ow1rYg4S5zePz9osIzQ1QyS4DDLB93kjqG0btyJNvzBAWj5icSrtea9D9FByodVDFg5xV2KICv3CDsHtqpuYUyyDA4Q/IxbrbEEY5vQM325Rl11dFBNY5ZAJLLfORetdEaJIRHsZn3MJ1lTBalBm2SJOc2b+bosYYfysrZVzkLcXI0dwfxQ/XSXdqIf3ZQ== 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=UCbwrs5oXq1OeT1l6zFqECRhA4ofWY/d6Pg2sliZFcQ=; b=WVLW6KMupFtS/gR2b9EIA5+cNdR9KoJI42Ej6xlzrviujidB4rLFHu8TLQuxvsfcWIrT2MnozVYszdqe/Nz00i8/5/RW0RwN7NiQ3k/yzviU8g9ytqIPqp8e/888opODTAM1I75cxd8xmbQ45+trzulpu6zWu5Z9c07zZ89xuQMRt7ozmFfENntqGDg7GagoTXdPmVUxp16Bd8ztE6mOE1vNvuM7CfyxbM7oQBAj+1AlZbQD6FBNC6Yit2S1eOw3xSTZOe4+nXZLQ/kcDwS/Wf+Elh6nK332jYJv2uQS6NrUuL5sfzil5uEhW81JuKkFxM4OC4F2ji0KK28Lpnqy0w== 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=UCbwrs5oXq1OeT1l6zFqECRhA4ofWY/d6Pg2sliZFcQ=; b=mwZUFANpcA4TuSPYHiqJeqaPMEoCuO1gCDz9J1N47L2hS9/gp6CUsNWnpKEwc/cZNSlGYSqJUgZPvZna728zpRQ+Iudxd9SfCEse98IjsmbfLxZdCVq+DRQT7Qtxoc+zYTfEdTBIzNWDePFuBq5cipQ/ZEkJlfambyx1lzQe2MQ= 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 OS7PR01MB11871.jpnprd01.prod.outlook.com (2603:1096:604:23d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.33; Tue, 28 Mar 2023 06:42:41 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::b10b:489e:5dfa:58b1%4]) with mapi id 15.20.6222.030; Tue, 28 Mar 2023 06:42:40 +0000 From: Nobuhiro MIKI To: dev@openvswitch.org Date: Tue, 28 Mar 2023 15:42:23 +0900 Message-Id: <20230328064223.51144-6-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230328064223.51144-1-nmiki@yahoo-corp.jp> References: <20230328064223.51144-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYCP286CA0043.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::14) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|OS7PR01MB11871:EE_ X-MS-Office365-Filtering-Correlation-Id: 26a0fa28-8c69-4601-b210-08db2f57a07f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o260i+hZa0UAO6HHprIZdMWphbg3Xh1QYhR7oNMKlbTAytYn7nnwf5vNtJEOB3ffXZfoiUUZfUrzb4fxH4rCDZo4lg18Xx6Hgx3ZF4JJwtxw36ACHgRHnqYyvu4nBpkHf6XO/axEdv6orGIeNXo/VohJZOyz0zf/mqj6Jk2Wl1d/ujYL+PXN6tlRDHKPimQc/xTbb/tbevWvRZemOdOQ424m/gAecl69/wFNfIhZRTrSNkyCxrHLxHVMx4/L4WC29aBTd5oCyN8W1gGBH3hCXdARowMfXToYPS6E2RV/J6Rt7atiRJAtIFkl5Rwc9orQ6ZVglFYffVbZKW9hgKM6zRgU/cVMuy/Ou54d9Ool4w3C8XG2dnAaE42+qGv5QO6fSFMLnTEmpd2d7nH1nDdMP228UUdxgQWgAjHFktzmwc1OYx+UJNcn4c1t5+GF2FrirHOxIMnSnkeHUgM0e5ovjmJYMDKQ0HDbA8Q0d2/XFggrTIadCrxaUaAXsjG6e/h5GHVCt2EgrEkUv4C1RuzZgBlzSZ4PMAuorCZU8/yX4g+hqvTD5X3n9NvP2t3aDI1bynQX7fnEZJ411HmPKynCTKogJzHKyosaiYKXu2DYV36wcgK2VoUvad3ch8hsNm1d 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)(396003)(346002)(366004)(39860400002)(136003)(376002)(451199021)(38350700002)(86362001)(36756003)(2906002)(107886003)(478600001)(6666004)(6486002)(2616005)(6512007)(52116002)(38100700002)(83380400001)(316002)(4326008)(6916009)(5660300002)(8676002)(66556008)(66476007)(66946007)(82960400001)(6506007)(186003)(1076003)(26005)(8936002)(30864003)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TZJlrwzjHWkcvOL6uuwgPkYH4bv9yejB7zRn0OYs7NR36YSt4naIXioY1WgOrnNhTewclq7TPcbxR2N2SB6NB/ueepEdUZ4WPVQzl+4mCFXS3XZuIBNTSI2pIEwrbENvIkwGm109M/R38Phz/XKOq/rX1NO0plAYnelcfzgYRKOBVyv2XWnJmtxs2zG8we0C+ySk2mahSKRzcksonASKG2g/e8rcrrYfb6Hk7amGYozpgmxcfNV8nkZX/OGnhWcFrY1N1HFYx8VDbj85GHj6U45Ks6CnaLiNpdMmgGN45f81O1SS+wlHNkWuczPGtSMPtDnw/Kv2x1za+29cwXwImI6yj9rFihB3FUGFSKBvIE+hl7Dx/s1O2A6N0qfDKf8cXUTzdye27vVhOC+BciIFdDTzIV7T0KxmGIdidFcBs8MzBcgvRnMy/GJ6J+d7UqH8h4D58u6e1debRlShwwMOQ3F5XpZZjlSKb007d24JD15/NfCBUGerH3k6RWzehXudWvSfxubJlndXLNKGS1O2+zOpHvZlxJhx5BSwBQ5cnpUbCFD/VXgSjwKQUNh8xj3FJhTJD0akAd+WqfskZl5L78doKkJmx6+lAPRc6vRi0IhFA6X12CjcRbYSW4M7DMbsLhJM6K3pNhiknKEY5lshdBdFkT59owc1nh0F4lnxglPR4QWXZAZOZU6xoLc2p9ZBM2h1QULK8u1amyeckWR7/DPy2C8PKP76iIi/WuQqSOTANoTFxcllxUvrKpn7dIIzPOTH5e015+mCiZFHR9k9d16jxG1fGOrmM48xu2u1xqNs13eO1LIKHS7C306UnUA5byDl7DCqfpyX9gDWVQLwVp8my5YUisRq3XufjNXB4RkdSQwo+528tkk+0HmHD8qiJPhxh4j2urYeKMbXAi7tInTFM9lvrHYRco0jhC202lkFsPzGNDYqM6BstehAEsKvo55ON6XVhgRqNujJP5/g48dVUOU9wIimaVsSFsKAl87jN3hEfAkhVFdz//Y4MadKO7Z34BCXDSkKSNoK28X85xXTtuOqJoqPSobmzA8pC3w87jvCHf1EK8yul+hWFuZFnChSRZjKKfIXSn+mnHrK6nHDd7lsOKuZ+86IygWdofd09elsXRAumYnS5IhatmATWqvD7v+LNrKZu4oTGFcTFCgRoVbXQ7Nyd6bxM8Tb1frqC4khocMYXJ6NAFkttOY2qY9u2BfewnwYiF1b3+2OxKoVKpnfQvxgz4JF2ckTTqqc0VW6C469AuaxCzTJPyaL4avIpZ1m6plepV/Qr3MMs+1Gwa/oCTHFQ5/HOMb7GMvaGKafKTFGwOQvclYFV0BJNWBDTTNnLFKC3OyBGJr7ZVbtvCSMLT4nAQxltcxwxTcTXr9O32n3CDM7usEMggfKzEGOB9liTJu3O7SHdjAAelHRuhSl/lrT6wgoxSq4ET5YFNAvIvHBLDKHIlTWoyoJhm0VdNpsxqkEgIDz62uJ657JrB1my7NOU2Yw4YJKjNM45Qgivj1K3Pgol9IsYZ+u6aGvQ6WSRvtsFEf+RLKD8LrmxY484ryeVnbV3quECk41GhojzdwDU3Ze4IoZ+LOO X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 26a0fa28-8c69-4601-b210-08db2f57a07f X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2023 06:42:40.8686 (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: j1MhOXTfRZDMs5Q0yMO58i8ZpbYvirF4q4w+6eANAB0PZagLZm8WCL7iKP5K3lG/HdnthRRDI2y7n3zoVxHJ2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11871 Subject: [ovs-dev] [PATCH v11 5/5] odp: Add SRv6 tunnel actions. 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" This patch adds ODP actions for SRv6 and its tests. Signed-off-by: Nobuhiro MIKI --- lib/odp-util.c | 70 +++++++++++++++++++++++++++++++++++ python/ovs/flow/odp.py | 8 ++++ python/ovs/tests/test_odp.py | 16 ++++++++ tests/odp.at | 12 +++++- tests/tunnel-push-pop-ipv6.at | 23 ++++++++++++ 5 files changed, 127 insertions(+), 2 deletions(-) diff --git a/lib/odp-util.c b/lib/odp-util.c index dbd4554d0626..2ec889c417e5 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -715,6 +715,24 @@ format_odp_tnl_push_header(struct ds *ds, struct ovs_action_push_tnl *data) } ds_put_char(ds, ')'); + } else if (data->tnl_type == OVS_VPORT_TYPE_SRV6) { + const struct srv6_base_hdr *srh; + struct in6_addr *segs; + int nr_segs; + int i; + + srh = (const struct srv6_base_hdr *) l4; + segs = ALIGNED_CAST(struct in6_addr *, srh + 1); + nr_segs = srh->last_entry + 1; + + ds_put_format(ds, "srv6("); + ds_put_format(ds, "segments_left=%d", srh->rt_hdr.segments_left); + ds_put_format(ds, ",segs("); + for (i = 0; i < nr_segs; i++) { + ds_put_format(ds, i > 0 ? "," : ""); + ipv6_format_addr(&segs[nr_segs - i - 1], ds); + } + ds_put_format(ds, "))"); } else if (data->tnl_type == OVS_VPORT_TYPE_GRE || data->tnl_type == OVS_VPORT_TYPE_IP6GRE) { const struct gre_base_hdr *greh; @@ -1534,6 +1552,7 @@ ovs_parse_tnl_push(const char *s, struct ovs_action_push_tnl *data) uint8_t hwid, dir; uint32_t teid; uint8_t gtpu_flags, gtpu_msgtype; + uint8_t segments_left; if (!ovs_scan_len(s, &n, "tnl_push(tnl_port(%"SCNi32"),", &data->tnl_port)) { return -EINVAL; @@ -1775,6 +1794,57 @@ ovs_parse_tnl_push(const char *s, struct ovs_action_push_tnl *data) tnl_type = OVS_VPORT_TYPE_GTPU; header_len = sizeof *eth + ip_len + sizeof *udp + sizeof *gtph; + } else if (ovs_scan_len(s, &n, "srv6(segments_left=%"SCNu8, + &segments_left)) { + struct srv6_base_hdr *srh = (struct srv6_base_hdr *) (ip6 + 1); + char seg_s[IPV6_SCAN_LEN + 1]; + struct in6_addr *segs; + struct in6_addr seg; + uint8_t n_segs = 0; + + if (segments_left + 1 > SRV6_MAX_SEGS) { + return -EINVAL; + } + + ip6->ip6_nxt = IPPROTO_ROUTING; + + srh->rt_hdr.hdrlen = 2 * (segments_left + 1); + srh->rt_hdr.segments_left = segments_left; + srh->rt_hdr.type = IPV6_SRCRT_TYPE_4; + srh->last_entry = segments_left; + + tnl_type = OVS_VPORT_TYPE_SRV6; + header_len = sizeof *eth + ip_len + + sizeof *srh + 8 * srh->rt_hdr.hdrlen; + /* Parse segment list. */ + if (!ovs_scan_len(s, &n, ",segs(")) { + return -EINVAL; + } + + segs = ALIGNED_CAST(struct in6_addr *, srh + 1); + segs += segments_left; + + while (ovs_scan_len(s, &n, IPV6_SCAN_FMT, seg_s) + && inet_pton(AF_INET6, seg_s, &seg) == 1) { + if (n_segs == segments_left + 1) { + return -EINVAL; + } + + memcpy(segs--, &seg, sizeof *segs); + n_segs++; + + if (s[n] == ',') { + n++; + } + } + + if (!ovs_scan_len(s, &n, ")))")) { + return -EINVAL; + } + + if (n_segs != segments_left + 1) { + return -EINVAL; + } } else { return -EINVAL; } diff --git a/python/ovs/flow/odp.py b/python/ovs/flow/odp.py index db63afc8d64d..88aee17fb2a4 100644 --- a/python/ovs/flow/odp.py +++ b/python/ovs/flow/odp.py @@ -474,6 +474,14 @@ class ODPFlow(Flow): } ) ), + "srv6": nested_kv_decoder( + KVDecoders( + { + "segments_left": decode_int, + "segs": decode_default, + } + ) + ), } ) ), diff --git a/python/ovs/tests/test_odp.py b/python/ovs/tests/test_odp.py index f8017ca8a169..a50d3185cc62 100644 --- a/python/ovs/tests/test_odp.py +++ b/python/ovs/tests/test_odp.py @@ -452,6 +452,22 @@ def test_odp_fields(input_string, expected): ), ], ), + ( + "actions:tnl_push(header(srv6(segments_left=1,segs(2001:cafe::90,2001:cafe::91))))", # noqa: E501 + [ + KeyValue( + "tnl_push", + { + "header": { + "srv6": { + "segments_left": 1, + "segs": "2001:cafe::90,2001:cafe::91", + } + } + }, + ), + ], + ), ( "actions:clone(1),clone(clone(push_vlan(vid=12,pcp=0),2),1)", [ diff --git a/tests/odp.at b/tests/odp.at index 26cda2967239..ba20604e43da 100644 --- a/tests/odp.at +++ b/tests/odp.at @@ -342,6 +342,8 @@ tnl_push(tnl_port(6),header(size=70,type=4,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:1 tnl_push(tnl_port(6),header(size=70,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=17,tclass=0x0,hlimit=64),udp(src=0,dst=6081,csum=0x0),geneve(oam,vni=0x1c7)),out_port(1)) tnl_push(tnl_port(6),header(size=78,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=17,tclass=0x0,hlimit=64),udp(src=0,dst=6081,csum=0x0),geneve(crit,vni=0x1c7,options({class=0xffff,type=0x80,len=4,0xa}))),out_port(1)) tnl_push(tnl_port(6),header(size=70,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=17,tclass=0x0,hlimit=64),udp(src=0,dst=6081,csum=0xffff),geneve(vni=0x1c7)),out_port(1)) +tnl_push(tnl_port(6),header(size=78,type=112,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=43,tclass=0x0,hlimit=64),srv6(segments_left=0,segs(2001:cafe::90))),out_port(1)) +tnl_push(tnl_port(6),header(size=110,type=112,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=43,tclass=0x0,hlimit=64),srv6(segments_left=2,segs(2001:cafe::90,2001:cafe::91,2001:cafe::92))),out_port(1)) ct ct(commit) ct(commit,zone=5) @@ -400,8 +402,14 @@ AT_CLEANUP AT_SETUP([OVS datapath actions parsing and formatting - invalid forms]) dnl This caused a hang in older versions. -AT_CHECK([echo 'encap_nsh@:{@' | ovstest test-odp parse-actions -], [0], [dnl +AT_DATA([actions.txt], [dnl +encap_nsh@:{@ +tnl_push(tnl_port(6),header(size=94,type=112,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=43,tclass=0x0,hlimit=64),srv6(segments_left=2,segs(2001:cafe::90,2001:cafe::91))),out_port(1)) +tnl_push(tnl_port(6),header(size=126,type=112,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=43,tclass=0x0,hlimit=64),srv6(segments_left=2,segs(2001:cafe::90,2001:cafe::91,2001:cafe::92,2001:cafe::93))),out_port(1)) +]) +AT_CHECK_UNQUOTED([ovstest test-odp parse-actions < actions.txt], [0], [dnl +odp_actions_from_string: error +odp_actions_from_string: error odp_actions_from_string: error ]) AT_CLEANUP diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at index 2cf306c67ecf..e300fe3a0d26 100644 --- a/tests/tunnel-push-pop-ipv6.at +++ b/tests/tunnel-push-pop-ipv6.at @@ -202,6 +202,8 @@ AT_CHECK([ovs-vsctl add-port int-br t2 -- set Interface t2 type=vxlan \ options:remote_ip=flow options:key=123 ofport_request=5\ -- add-port int-br t5 -- set Interface t5 type=gre \ options:remote_ip=2001:cafe::92 options:key=455 options:packet_type=legacy_l3 ofport_request=6\ + -- add-port int-br t6 -- set Interface t6 type=srv6 \ + options:remote_ip=2001:cafe::92 ofport_request=7\ ], [0]) AT_CHECK([ovs-appctl dpif/show], [0], [dnl @@ -216,12 +218,15 @@ dummy@ovs-dummy: hit:0 missed:0 t3 4/4789: (vxlan: csum=true, out_key=flow, remote_ip=2001:cafe::93) t4 5/6081: (geneve: key=123, remote_ip=flow) t5 6/3: (gre: key=455, packet_type=legacy_l3, remote_ip=2001:cafe::92) + t6 7/6: (srv6: remote_ip=2001:cafe::92) ]) AT_CHECK([ovs-appctl tnl/ports/show |sort], [0], [dnl Listening ports: genev_sys_6081 (6081) ref_cnt=1 gre_sys (3) ref_cnt=2 +srv6_sys (6) ref_cnt=1 +srv6_sys (6) ref_cnt=1 vxlan_sys_4789 (4789) ref_cnt=2 ]) @@ -363,6 +368,8 @@ AT_CHECK([ovs-appctl tnl/ports/show |sort], [0], [dnl Listening ports: genev_sys_6081 (6081) ref_cnt=1 gre_sys (3) ref_cnt=2 +srv6_sys (6) ref_cnt=1 +srv6_sys (6) ref_cnt=1 vxlan_sys_4789 (4789) ref_cnt=2 ]) @@ -384,6 +391,12 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: tnl_pop(6081) ]) +dnl Check SRv6 tunnel pop +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x86dd),ipv6(src=2001:cafe::92,dst=2001:cafe::88,label=0,proto=4,tclass=0x0,hlimit=64)'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: tnl_pop(6) +]) + dnl Check VXLAN tunnel push AT_CHECK([ovs-ofctl add-flow int-br action=2]) 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:01),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout]) @@ -405,6 +418,13 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: tnl_push(tnl_port(3),header(size=62,type=109,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=47,tclass=0x0,hlimit=64),gre((flags=0x2000,proto=0x6558),key=0x1c8)),out_port(100)),1 ]) +dnl Check SRv6 tunnel push +AT_CHECK([ovs-ofctl add-flow int-br action=7]) +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:01),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: pop_eth,tnl_push(tnl_port(6),header(size=78,type=112,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::92,label=0,proto=43,tclass=0x0,hlimit=64),srv6(segments_left=0,segs(2001:cafe::92))),out_port(100)),1 +]) + dnl Check Geneve tunnel push AT_CHECK([ovs-ofctl add-flow int-br "actions=set_field:2001:cafe::92->tun_ipv6_dst,5"]) 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:01),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout]) @@ -510,6 +530,8 @@ AT_CHECK([ovs-appctl tnl/ports/show |sort], [0], [dnl Listening ports: genev_sys_6081 (6081) ref_cnt=1 gre_sys (3) ref_cnt=1 +srv6_sys (6) ref_cnt=1 +srv6_sys (6) ref_cnt=1 vxlan_sys_4789 (4789) ref_cnt=1 vxlan_sys_4790 (4790) ref_cnt=1 ]) @@ -518,6 +540,7 @@ AT_CHECK([ovs-vsctl del-port int-br t1 \ -- del-port int-br t2 \ -- del-port int-br t4 \ -- del-port int-br t5 \ + -- del-port int-br t6 \ ], [0]) dnl Check tunnel lookup entries after deleting all remaining tunnel ports