From patchwork Wed May 29 22:18:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1941489 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=Gn7dHfAn; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VqP0y3h0hz20Pc for ; Thu, 30 May 2024 08:18:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 8079D405DD; Wed, 29 May 2024 22:18:40 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id fqStXkDW9hf6; Wed, 29 May 2024 22:18:38 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org BD071400F8 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=Gn7dHfAn Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id BD071400F8; Wed, 29 May 2024 22:18:38 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 782A0C0077; Wed, 29 May 2024 22:18:38 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id CD306C0037 for ; Wed, 29 May 2024 22:18:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B422182042 for ; Wed, 29 May 2024 22:18:36 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id PnJKu-6L12lS for ; Wed, 29 May 2024 22:18:33 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f403:200a::601; helo=nam12-mw2-obe.outbound.protection.outlook.com; envelope-from=witu@nvidia.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 997458202F Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 997458202F Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=Gn7dHfAn Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20601.outbound.protection.outlook.com [IPv6:2a01:111:f403:200a::601]) by smtp1.osuosl.org (Postfix) with ESMTPS id 997458202F for ; Wed, 29 May 2024 22:18:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QzjOlXfbabAMY2+i2T7IpLi+0rQw6UnlCD4waUOtVRQPrb7bW7eimhySMIIxbhMZiY/5XSk9nMSzXd5Ykadt/6UhuSUEsbf+i/3BUOj4eumWqgQJGpCP18dfAbHMdvRfuNFi5GsHKvuyaT7LTegCmKFWkwnt+eg1BOrnSb+78kOgZL6sbkXs56blksxKqsc/yX9lyfBiWZonPsWUgJIeMSJhxkHZgp/PbH746sNOOjybKUPkFFnBssNp3aZrwF2fsmXnrd8L69lvIX4zIE2ICC6ZGQeR3rsZhj23lAPKDmexA5bPes7o7kaNPovmAHP9XPo7gy8+Un4g8DG0Q2m2ZQ== 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=QfLiFfWclvSB0K2RlyM89WVvYaeVMSjAitBz7QAwvEs=; b=arh4Q+EPRyYzhadOUzsRN0tVGwNNux7jZbFFX84nK67dXa+ajTUcPPuu/Nwt4zgibluWLG4SQvBNAiH2l91FcMuiT/IOFfSVGpOyc8UJjcsWlxquoPACR5qLwm9vALz2iY6vMcJj5l3bOjZYM5axUyTkeEmJkLYBUifjwauv0MfTCuW9NqOQ6cL/OMJaQ3RcnfiqnfAWo9BCX0PwgLJFMe1c64H34S69sKbfGerF5QFRQbMF3F+s3/wxjWIv+fq+RtaLeJMTF44SOoPCLHF3syOzKCApOmDjAs7wS7y2+ms//Uy0M931J0rTtczNjCMKiDTf0TB7OeQDhP97O2ZE1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=openvswitch.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QfLiFfWclvSB0K2RlyM89WVvYaeVMSjAitBz7QAwvEs=; b=Gn7dHfAnW+Qajtg8xY7KlQJgfF66SRAEQSTXvctRjTO2NOLVNVX3E0OqDkywrRho6QzIY7ev4PC3OSKvml13l3CXD56xICkgsSTVk6oEMy64QeZRYTqFQIWbpVzio5zErOBJorblKQhl4RP0G3IM73DYoRM9cbJfP450PuP/Xs7a2jmhzs78xYknh/qkIMfyb5jfWq+kQ0vfYjmCrjCikpyTxqfmHpkNglE00NF35F5CB+mQSUzQ6HsdY1cRXW8q5VUzTkyBCThpDCsOKd5GcZcaFoLSeoOirU72kZaiXVtKgQkARvwF433YBaOyRk5Svj8TVcbeYPUQ2B0dOjOA6g== Received: from CH0PR04CA0083.namprd04.prod.outlook.com (2603:10b6:610:74::28) by PH8PR12MB7352.namprd12.prod.outlook.com (2603:10b6:510:214::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.29; Wed, 29 May 2024 22:18:27 +0000 Received: from DS3PEPF000099DC.namprd04.prod.outlook.com (2603:10b6:610:74:cafe::42) by CH0PR04CA0083.outlook.office365.com (2603:10b6:610:74::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.31 via Frontend Transport; Wed, 29 May 2024 22:18:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS3PEPF000099DC.mail.protection.outlook.com (10.167.17.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.15 via Frontend Transport; Wed, 29 May 2024 22:18:26 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 29 May 2024 15:18:12 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 29 May 2024 15:18:11 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 29 May 2024 15:18:09 -0700 To: Date: Thu, 30 May 2024 01:18:04 +0300 Message-ID: <20240529221804.380315-1-witu@nvidia.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DC:EE_|PH8PR12MB7352:EE_ X-MS-Office365-Filtering-Correlation-Id: b19e7a5b-1e20-4c6a-64ea-08dc802d4346 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|376005|82310400017|1800799015; X-Microsoft-Antispam-Message-Info: r+9iYEPYPqZT0eSG24b60v4I6TipKB12dUzyrrmW908B7DraHPEVbhASq8z2l4mQtyw8PdL4SSl5ixEOddbWN9gg1Ww1FO+PVZUBp9XrqJMahKawN3hBph+BKQ3/gEjThAIASefZJ4JAsXajo1yHgDWX3jbP6SwKJ78zpzim4M2JC/id0Ej9HzEWybmUrfCNcP6fvWIqL/sWR3oXy0VxF4WOfUL2MbuLSsQTPDMhkJHjMVxpRIc1Plvmq82d80aKYZUG/0yq4oqfhf1R2Ehu+6AskqAGSTTSs4jW9JNPchphG0ub73Lignqs/4m/Zn0XvS5GRdmQhpsyeiub1SHnizicM0kMn+uGRM6JionTstD3orNODAp4j80ZEzcc3C1uZ/9tqR/yv96YDU4f8hVq1p8ixv8c8vyKMCV+1H7/Iw5B6c0wlpT/Y0CNL/gSGjvUcPXIC520BToFq7XiXqRUKjWIuP8pVb9sMyzkflUDGcwjq6u7kTYf0cyrKojQtIcnljrXLK0zvtkw3dtY408KQHw72HmgHUXSZUwm2+Sc2k+62u/s7Y8zFt433lNQQPTEMzSJSOJ3ev/e1ROljDFslswAHwhK1xNEPH70kxOebpuf5jNA4KVj9gC0G6Zrcoc4HPovoe2p1sPDEjkF7hXAtyVWJAFAA7hlnYPReSQfbCMmi6DUSC3o67+D1Y8LYTyA0m5b2pjgm4L8W4PY03TosyhT/GO4mmkNIyWa8etJHdcE3uBe/tJwIPQkR9Rh7D0a11M4/PKAW8TSpuxXrSE4SNiq7OhXKRr2lxvVEzQRKdM9pQXJYQ0yIs7I+l4SwEkBS4baW7g+vH0Za6NXxyCkrILFSfy7Z7n8msr1SRIfDU7QZGPvQy44qiWkgRPY9ZC9SDlEUt5v8dsDlSqjkIudnHTNnAr5O62SXv52LypBnGS0g+1Xq1TVr6PmyvbE0FKVFljFJ8r2FEQx+WPt3tV64U1EK7uyXgDzuy5Ip0wASAcbSUAG1ywlVBo/oXuS7O703OvdAmR6SlE6ZA43Pg8aFJtleF+MYF1OVkpiQlO6KxctVPie8+IyYkyKUN6gK6wcgCVae2KA8t4xeUwLqoYukedUbNYSSeW5fR15sOz3rUNLLQN8qsTvIxVYC9WThqA4ryDnpT+w+trmUWlR7OKxbhrENYaw9uzQ1aLys6hleYfhxOd+O5CkfVfGXl8FJifkK1lu41KhCphOJAxAtW7IyDXYED8KX6UWXNZEfDrYBhswQ3I9F5Eq9oT1lh3RIUPEbPqJGMTx1Ybp/CQJyoHzuGcgyv2eldTaqsEYd/3Ajm9oYnXY8j2w2Tu4aQiR1jFXom0ZDrQmKMaXIJ4AQZAZwRRsvurOuN7viwWqQUr9SgOVhotAdaQHyq5R7IlYJuVU X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(376005)(82310400017)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2024 22:18:26.8775 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b19e7a5b-1e20-4c6a-64ea-08dc802d4346 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099DC.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7352 Cc: i.maximets@ovn.org, bodong@nvidia.com, derrick.lim@rakuten.com, maord@nvidia.com Subject: [ovs-dev] [PATCH v4] route-table: Add support for v4 via v6 route. 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: , X-Patchwork-Original-From: William Tu via dev From: William Tu Reply-To: William Tu Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Add route-table support for ipv4 dst via ipv6. One use case is BGP unnumbered, a mechanism that establishes peering sessions without the need to explicitly configure IPv4 addresses on the interfaces involved in the peering. Without using IPv4 address assignments, it uses link-local IPv6 addresses of the directly connected neighbors for peering purposes. For example, BGP might install the following route: $ ip route get 100.87.18.3 100.87.18.3 via inet6 fe80::920a:84ff:fe9e:9570 \ dev br-phy src 100.87.18.6 Note that the v6 addr fe80::920a:84ff:fe9e:9570 is not being used in the packet header, but only used for lookup the out dev br-phy. Currently OVS can only support either all-ipv4 or all-ipv6, the patch adds support for such use case. Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2024-January/052908.html Acked-by: Simon Horman Signed-off-by: William Tu --- v4: feedback from Ilya - add route del test case, wrap around test width - not set neighbor cache manually - on br-phy, use /32 on address in steead of /24 compare v3 and v4 https://github.com/williamtu/ovs/compare/router..router-v4 v3: add vxlan test, remove rfc v2: fix CI error --- lib/ovs-router.c | 38 +++++++++++----------- lib/route-table.c | 21 ++++++++++++ ofproto/ofproto-dpif-xlate.c | 3 +- tests/ovs-router.at | 51 +++++++++++++++++++++++++++++ tests/system-route.at | 39 ++++++++++++++++++++++ tests/tunnel-push-pop.at | 63 ++++++++++++++++++++++++++++++++++++ 6 files changed, 196 insertions(+), 19 deletions(-) diff --git a/lib/ovs-router.c b/lib/ovs-router.c index 3d84c9a30a8f..bcfc7b8bd98a 100644 --- a/lib/ovs-router.c +++ b/lib/ovs-router.c @@ -184,6 +184,10 @@ verify_prefsrc(const struct in6_addr *ip6_dst, goto out; } + /* Skip the check if not the same address family */ + if (!IN6_IS_ADDR_V4MAPPED(ip6_dst) && IN6_IS_ADDR_V4MAPPED(prefsrc)) + goto out; + for (i = 0; i < n_in6; i++) { struct in6_addr a1, a2; a1 = ipv6_addr_bitand(ip6_dst, &mask[i]); @@ -415,7 +419,6 @@ ovs_router_add(struct unixctl_conn *conn, int argc, unsigned int plen; ovs_be32 src = 0; ovs_be32 gw = 0; - bool is_ipv6; ovs_be32 ip; int err; int i; @@ -423,9 +426,8 @@ ovs_router_add(struct unixctl_conn *conn, int argc, if (scan_ipv4_route(argv[1], &ip, &plen)) { in6_addr_set_mapped_ipv4(&ip6, ip); plen += 96; - is_ipv6 = false; } else if (scan_ipv6_route(argv[1], &ip6, &plen)) { - is_ipv6 = true; + ; } else { unixctl_command_reply_error(conn, "Invalid 'ip/plen' parameter"); @@ -438,21 +440,21 @@ ovs_router_add(struct unixctl_conn *conn, int argc, continue; } - if (is_ipv6) { - if (ovs_scan(argv[i], "src="IPV6_SCAN_FMT, src6_s) && - ipv6_parse(src6_s, &src6)) { - continue; - } - if (ipv6_parse(argv[i], &gw6)) { - continue; - } - } else { - if (ovs_scan(argv[i], "src="IP_SCAN_FMT, IP_SCAN_ARGS(&src))) { - continue; - } - if (ip_parse(argv[i], &gw)) { - continue; - } + if (ovs_scan(argv[i], "src="IPV6_SCAN_FMT, src6_s) && + ipv6_parse(src6_s, &src6)) { + continue; + } + + if (ipv6_parse(argv[i], &gw6)) { + continue; + } + + if (ovs_scan(argv[i], "src="IP_SCAN_FMT, IP_SCAN_ARGS(&src))) { + continue; + } + + if (ip_parse(argv[i], &gw)) { + continue; } unixctl_command_reply_error(conn, diff --git a/lib/route-table.c b/lib/route-table.c index f1fe32714e8d..58412711888f 100644 --- a/lib/route-table.c +++ b/lib/route-table.c @@ -232,6 +232,7 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change) [RTA_OIF] = { .type = NL_A_U32, .optional = true }, [RTA_GATEWAY] = { .type = NL_A_U32, .optional = true }, [RTA_MARK] = { .type = NL_A_U32, .optional = true }, + [RTA_VIA] = { .type = NL_A_UNSPEC, .optional = true }, [RTA_PREFSRC] = { .type = NL_A_U32, .optional = true }, [RTA_TABLE] = { .type = NL_A_U32, .optional = true }, }; @@ -241,6 +242,7 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change) [RTA_OIF] = { .type = NL_A_U32, .optional = true }, [RTA_MARK] = { .type = NL_A_U32, .optional = true }, [RTA_GATEWAY] = { .type = NL_A_IPV6, .optional = true }, + [RTA_VIA] = { .type = NL_A_UNSPEC, .optional = true }, [RTA_PREFSRC] = { .type = NL_A_IPV6, .optional = true }, [RTA_TABLE] = { .type = NL_A_U32, .optional = true }, }; @@ -333,6 +335,25 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change) nl_attr_get_in6_addr(attrs[RTA_PREFSRC]); } } + if (attrs[RTA_VIA]) { + const struct rtvia *via; + ovs_be32 gw; + + via = nl_attr_get(attrs[RTA_VIA]); + switch (via->rtvia_family) { + case AF_INET: + gw = *(ALIGNED_CAST(ovs_be32 *, via->rtvia_addr)); + in6_addr_set_mapped_ipv4(&change->rd.rta_gw, gw); + break; + case AF_INET6: + change->rd.rta_gw = *(ALIGNED_CAST(struct in6_addr *, + via->rtvia_addr)); + break; + default: + VLOG_WARN("Unknown address family %d\n", via->rtvia_family); + return 0; + } + } if (attrs[RTA_GATEWAY]) { if (ipv4) { ovs_be32 gw; diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index 7c495089509f..3694a8430382 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -3612,7 +3612,8 @@ tnl_route_lookup_flow(const struct xlate_ctx *ctx, } if (ipv6_addr_is_set(&gw) && - (!IN6_IS_ADDR_V4MAPPED(&gw) || in6_addr_get_mapped_ipv4(&gw))) { + (!IN6_IS_ADDR_V4MAPPED(&gw) || in6_addr_get_mapped_ipv4(&gw)) && + (!IN6_IS_ADDR_V4MAPPED(&dst) || IN6_IS_ADDR_V4MAPPED(&gw))) { *ip = gw; } else { *ip = dst; diff --git a/tests/ovs-router.at b/tests/ovs-router.at index b3314b3dff0d..5e5e1d013464 100644 --- a/tests/ovs-router.at +++ b/tests/ovs-router.at @@ -109,6 +109,57 @@ User: 2001:db8:beef::14/128 MARK 14 dev br0 GW 2001:db8:cafe::1 SRC 2001:db8:caf OVS_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([appctl - route/add and del with ipv4 via ipv6]) +AT_KEYWORDS([ovs_router]) +OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=dummy]) +AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 192.168.9.2/24], [0], [OK +]) +AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 192.168.9.3/24], [0], [OK +]) + +dnl defualt pick the first IP, 192.168.9.2, as src +AT_CHECK([ovs-appctl ovs/route/add 192.168.9.10/32 br0 dnl +fe80::920a:84ff:beef:9510], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/add 192.168.9.11/32 br0 dnl +fe80::920a:84ff:beef:9511 src=192.168.9.2], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/add 192.168.9.12/32 br0 dnl +fe80::920a:84ff:beef:9512 src=192.168.9.3], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/add 192.168.9.13/32 br0 dnl +fe80::920a:84ff:beef:9513 pkt_mark=13 src=192.168.9.3], [0], [OK +]) + +AT_CHECK([ovs-appctl ovs/route/show | grep User | grep beef | sort], [0], [dnl +User: 192.168.9.10/32 dev br0 GW fe80::920a:84ff:beef:9510 SRC 192.168.9.2 +User: 192.168.9.11/32 dev br0 GW fe80::920a:84ff:beef:9511 SRC 192.168.9.2 +User: 192.168.9.12/32 dev br0 GW fe80::920a:84ff:beef:9512 SRC 192.168.9.3 +User: 192.168.9.13/32 MARK 13 dev br0 GW fe80::920a:84ff:beef:9513 SRC 192.168.9.3 +]) + +dnl DST and SRC can be in different domain +AT_CHECK([ovs-appctl ovs/route/add 192.168.10.12/32 br0 dnl +fe80::920a:84ff:face:9512 src=192.168.9.3], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/show | grep User | grep face | sort], [0], [dnl +User: 192.168.10.12/32 dev br0 GW fe80::920a:84ff:face:9512 SRC 192.168.9.3 +]) + +dnl Delete route +AT_CHECK([ovs-appctl ovs/route/del 192.168.9.10/32], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/del 192.168.9.11/32], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/del 192.168.9.12/32], [0], [OK +]) +AT_CHECK([ovs-appctl ovs/route/del 192.168.9.13/32 pkt_mark=13], [0], [OK +]) +OVS_WAIT_UNTIL([test $(ovs-appctl ovs/route/show | grep -c '192.168.9.1') -eq 0 ]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + AT_SETUP([appctl - route/lookup]) AT_KEYWORDS([ovs_router]) OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=dummy]) diff --git a/tests/system-route.at b/tests/system-route.at index c0ecad6cfb49..dbb2afa5a8fe 100644 --- a/tests/system-route.at +++ b/tests/system-route.at @@ -65,6 +65,45 @@ Cached: fc00:db8:beef::13/128 dev br0 GW fc00:db8:cafe::1 SRC fc00:db8:cafe::2]) OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([ovs-route - add and del system route ipv4 via ipv6]) +AT_KEYWORDS([route]) +OVS_TRAFFIC_VSWITCHD_START() +AT_CHECK([ip link set br0 up]) + +AT_CHECK([ip addr add 192.168.9.2/24 dev br0], [0], [stdout]) +AT_CHECK([ip addr add 192.168.9.3/24 dev br0], [0], [stdout]) + +AT_CHECK([ip -6 addr add fc00:db8:cafe::2/64 dev br0], [0], [stdout]) +AT_CHECK([ip -6 addr add fc00:db8:cafe::3/64 dev br0], [0], [stdout]) + +AT_CHECK([ip route add 192.168.9.12/32 dev br0 dnl +via inet6 fe80::920a:84ff:fe9e:9512 src 192.168.9.2], [0], [stdout]) +AT_CHECK([ip route add 192.168.9.13/32 dev br0 dnl +via inet6 fe80::920a:84ff:fe9e:9513 src 192.168.9.3], [0], [stdout]) + +OVS_WAIT_UNTIL_EQUAL([ovs-appctl ovs/route/show | grep -E '192.168.9.1[[23]]/32' | sort], [dnl +Cached: 192.168.9.12/32 dev br0 GW fe80::920a:84ff:fe9e:9512 SRC 192.168.9.2 +Cached: 192.168.9.13/32 dev br0 GW fe80::920a:84ff:fe9e:9513 SRC 192.168.9.3]) + +AT_CHECK([ovs-appctl ovs/route/add 192.168.9.14/32 br0 dnl +fe80::920a:84ff:fe9e:9514 src=192.168.9.2], [0], [OK +]) + +OVS_WAIT_UNTIL_EQUAL([ovs-appctl ovs/route/show | grep -E '192.168.9.14/32' | sort], [dnl +User: 192.168.9.14/32 dev br0 GW fe80::920a:84ff:fe9e:9514 SRC 192.168.9.2]) + +dnl Delete system cached route +AT_CHECK([ip route del 192.168.9.12/32 dev br0 dnl +via inet6 fe80::920a:84ff:fe9e:9512 src 192.168.9.2], [0], [stdout]) +AT_CHECK([ip route del 192.168.9.13/32 dev br0 dnl +via inet6 fe80::920a:84ff:fe9e:9513 src 192.168.9.3], [0], [stdout]) + +OVS_WAIT_UNTIL([test $(ovs-appctl ovs/route/show | grep -c '192.168.9.12/32') -eq 0 ]) +OVS_WAIT_UNTIL([test $(ovs-appctl ovs/route/show | grep -c '192.168.9.13/32') -eq 0 ]) + +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP + dnl Checks that OVS doesn't use routes from non-standard tables. AT_SETUP([ovs-route - route tables]) AT_KEYWORDS([route]) diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at index 508737c53ec6..7266f0990570 100644 --- a/tests/tunnel-push-pop.at +++ b/tests/tunnel-push-pop.at @@ -196,6 +196,69 @@ OVS_WAIT_UNTIL([test `ovs-pcap p0.pcap | grep 100022eb0000000120000237 | wc -l` OVS_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([tunnel_push_pop - v4 via v6 route]) + +OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00]) +AT_CHECK([ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy], [0]) +AT_CHECK([ovs-vsctl add-port int-br t1 -- set Interface t1 type=vxlan \ + options:remote_ip=1.1.2.92 options:key=123 ofport_request=1\ + ], [0]) + +AT_CHECK([ovs-appctl dpif/show], [0], [dnl +dummy@ovs-dummy: hit:0 missed:0 + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy) + int-br: + int-br 65534/2: (dummy-internal) + t1 1/4789: (vxlan: key=123, remote_ip=1.1.2.92) +]) + +AT_CHECK([ovs-ofctl add-flow br0 action=normal]) + +dnl Setup dummy interface IP addresses. +AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 1.1.2.88/32], [0], [OK +]) +AT_CHECK([ovs-appctl netdev-dummy/ip6addr br0 2001:cafe::88/64], [0], [OK +]) +dnl Add a static v4 via v6 route +AT_CHECK([ovs-appctl ovs/route/add 1.1.2.92/32 br0 2001:cafe::10 src=1.1.2.89], [0], [OK +]) + +AT_CHECK([ovs-appctl ovs/route/show | grep br0 | sort], [0], [dnl +Cached: 1.1.2.88/32 dev br0 SRC 1.1.2.88 local +Cached: 2001:cafe::/64 dev br0 SRC 2001:cafe::88 local +User: 1.1.2.92/32 dev br0 GW 2001:cafe::10 SRC 1.1.2.89 +]) + +dnl Check ARP Snoop +AT_CHECK([ovs-appctl netdev-dummy/receive p0 'recirc_id(0),in_port(100),dnl +eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),dnl +arp(sip=1.1.2.92,tip=1.1.2.88,op=2,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)']) + +ovs-appctl time/warp 1000 +ovs-appctl time/warp 1000 + +AT_CHECK([ovs-appctl tnl/neigh/show | tail -n+3 | sort], [0], [dnl +1.1.2.92 f8:bc:12:44:34:b6 br0 +]) + +dnl Check VXLAN tunnel push +AT_CHECK([ovs-ofctl add-flow int-br action=1]) +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),dnl +eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x0800),dnl +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: tnl_push(tnl_port(4789),header(size=50,type=4,dnl +eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),dnl +ipv4(src=1.1.2.89,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),dnl +udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x7b)),out_port(100)),1 +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + AT_SETUP([tunnel_push_pop - action]) OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00])