From patchwork Thu Nov 3 09:45:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1698801 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" (2048-bit key; unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=gC9iSwRI; 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 4N2zR56PHBz23lK for ; Thu, 3 Nov 2022 20:46:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4139E60FB2; Thu, 3 Nov 2022 09:46:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4139E60FB2 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=gC9iSwRI 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 eDzrcx4IAhCl; Thu, 3 Nov 2022 09:46:06 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 5A53A60F88; Thu, 3 Nov 2022 09:46:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5A53A60F88 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 22106C0078; Thu, 3 Nov 2022 09:46:05 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 99DAFC007B for ; Thu, 3 Nov 2022 09:46:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5072940951 for ; Thu, 3 Nov 2022 09:46:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5072940951 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=gC9iSwRI 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 ulDJZpeyu9i2 for ; Thu, 3 Nov 2022 09:46:00 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CD6584098B Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2115.outbound.protection.outlook.com [40.107.21.115]) by smtp4.osuosl.org (Postfix) with ESMTPS id CD6584098B for ; Thu, 3 Nov 2022 09:45:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KFNZwCvngBfxcj7XqzErt5AKpAaZWbI0OXG+Qc9wxYOfx53aNoVEJk38feCR7sE44rTcXFi/NrhNIaaQR1NX6/+OUKyMf6s6AniIU730WS7JIQbaqfY0GspUEPjiEhw/XnHUgSEOmOd4EcVmldqhBDIiKKCHN7+SZxAvihR/rgy3PnUUZo8knMrHKarElaoNJAxm81qhnTkZHchhku+SbV1PimCoqRyTtldBEqzeDW3+6BnntDgywcy25zYXDBD2aNGqpJ5j6YowfuraPleCSro6yfvvX+4+XjOYSVDyr0ZundUL8b/G6dSNxzwsM4UZBOKh39YqdRJKBkDNSmcAdg== 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=n6J0yF4YcssMSW8BQYs4vilFNIJsoNpiDBJzDyzjcrI=; b=QzeeFOYZx06GtPOe5XYC2zcCjRDqRc6WZe/4qyizjyZiLb9+pAquyZ7zqWJ6ezMEn4L4GYp/xugZVqDShC3MpDv7Ipa028Dfe0MXgDt7b9TGvBBUo0VHAVqRXwDsuOsbRf+oP/cQW/9GqmLv7eSSHEPpdVDl2+Y5b1MS1Ldmpgzo1zaVXTXFjybtqCqXww/4FLdmiD7p9VN/vojOYiiyI5BTeY9bCFa+4cJGbKD08JqZDYJYJqf/Qcq6T1hhXtp4Vp7/lQ7WQH3pA126wTegeQiagKrsSUZseS74S2ibnlfGTvfBRqDFbmPhhgLuflGWYKWl0yMKzIH1LWXVT8UGpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mail.schwarz; dmarc=pass action=none header.from=mail.schwarz; dkim=pass header.d=mail.schwarz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.schwarz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n6J0yF4YcssMSW8BQYs4vilFNIJsoNpiDBJzDyzjcrI=; b=gC9iSwRIgi7sMoBwdIk5zDf3BXs8/BKG37jKlNrFS8qQw5o3DNx78tmUtZMVmXYpQBjTKIz/kNSPux5BzEiSVLrXH3HudJEYp+Cy58dw2j6As24DoM5CoW2HTzJXZ736Bwu5T96n3QM7Ux9x729CCNV9p4rPZiwRiFnSiU0W7/JoyPvwuBMDzgzK5NDw6TZcPaCGzEZrXr+Z0v5KZ7oIiDYwU+5ILKsIxlQMQ3pH2m8se3Bx+aBIwBQ6O5kHHYW8usArdN2IuhWzD8HAwt65K5msTIwJ9ujXxb3ISCNS8qYFy+kGIotK8AFCWFU9TqfW/mdYFT6adf7vZLFq3cbCtA== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AM7PR10MB3624.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:13e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Thu, 3 Nov 2022 09:45:56 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b%6]) with mapi id 15.20.5791.022; Thu, 3 Nov 2022 09:45:56 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn v2 1/4] logical-fields: add rarp fields Thread-Index: AdjvaRAU7YeC0EsSTIeWcJy+n4zKDg== Date: Thu, 3 Nov 2022 09:45:55 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mail.schwarz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DU0PR10MB5244:EE_|AM7PR10MB3624:EE_ x-ms-office365-filtering-correlation-id: b610b5c2-a690-4f8a-becf-08dabd80347a x-mp-schwarz-dsgvo2: 1 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uw+yNGuAiBd7tR3njf/38wjmL3okxnrNJwiHsLNFYIFQ5viGlv3zgFaRHtz1mo/wuI78w+be1cleu9tqz5oqr5j2T483hRt0wCIpOA6h2QaxwW5s+Jhat8r9gu18sSE0YdvS92Zt/ns9kzzTaYzOeR8K8K9XH1p4WQYTMn7n4eq6lgVZODxeWuOWfJJtNVMBJnUI+9UNCiSEbh0mjd3NPgko5993KzNDYoBYhKmeGBLpdxzbmyiOizBtZDo8qBlkZ9e2rQ5x1qyCgO6QTrKFOZml52migGPdMVsdGPRHTTH91PcbLXYHNJqNOgCRP4rVTKOMbCwbl1KIQeBgiBaKiYY2qpR8ecHvUfxZa7VGdIIF5evWnUYTd7ooDOxQhpEHpQMTG32hRq+iXNRyTBKyfQovjTvDUYUr6+d6+VdTDEiHqmX80EpgKOP5npsJFUM/3B3qpoMAiwran1rlzkmrOk4ZZ7bMuZNwl7Jzsll3kaTz58Ee63S5CIUFkEfGYFRbRpV2BAgekaiBalE1uW+N9waqzR3oANtwRdaR0gb/qkYX19LSfC31CiOAFPcPa4123mdJoDesmR7JyqZFHmK9/gV2rsT0+CeAGStTybip/zzXJ6TI12mPzfPkRO5Xou92+PIo2AihHfwVUdGzbowxdejwU831G8MVdBrY0j+gJJVKmL/SCQLDyUGegnXiLl/c0N2T3yRl/51+fjooMJzdIKYb96o7U6fYHuTEOyAYjX17S5NnOn9M1Py7k9B/N83RiMonKqD1HZFyalfXAlpRfR+9R/1uSf3wQioGzAOe2HA= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(186003)(83380400001)(9686003)(7696005)(6506007)(26005)(82960400001)(66574015)(2906002)(55016003)(5660300002)(66556008)(6916009)(316002)(478600001)(71200400001)(41300700001)(8936002)(8676002)(76116006)(52536014)(66446008)(64756008)(66476007)(66946007)(33656002)(38100700002)(122000001)(38070700005)(86362001)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?uyAVPu85v2WsKidK95f/k0Z?= =?iso-8859-1?q?7P4Og6IICkGzBLs7m90JuC45zKyaJQqOthrKkM9Q00/Yd+ryxhDWcpH7BJAH?= =?iso-8859-1?q?UQM8IM5kzjQ6nOdbwfSPSCQ2gIb0tTCdW9g0el1ZPAHSAcrXbAXRWwvyXOwz?= =?iso-8859-1?q?l2tWfOfGVF/LzoWjO/tItTkkuSvttiB+u6fmtlqrHUGMMQpwbjyJyT53KlCS?= =?iso-8859-1?q?q/2KDquzgaBNbwRtVI5WWWhaDDvEx3gXVha2y3TzuaDd6zD87VcG1/r0xd8y?= =?iso-8859-1?q?TXToR60rn4/ZMYtP+n8yv6RtX8cF7a515vol2pbaWp7Z7ILOLJKl+k60FOtw?= =?iso-8859-1?q?1uUuIzGkZ5WtMkBWornfnSzSyHEbnu4tr7G+w0j8ACvjUlGTfrJF5aqLixy0?= =?iso-8859-1?q?sdhunMjjcICwX1NtBlOsTd0UAK1u5mjpO80r474KVCVKO8++ofOUF5GFGwmg?= =?iso-8859-1?q?dQxZDtPeNDmbcoo7pbebbOIjM3il4zvwvXc4zVaZ/fF93C1i7m+VyXO5PeDH?= =?iso-8859-1?q?KzldWvazBst/aNwU88vBTBa2MFg8MV7N1xQjlWf7hLagn2Buq+RwdVXPpXr9?= =?iso-8859-1?q?CbiwdfoXU3+8wDp1ZntutG/i+cVrv+BsXwyY0gAe5ODq2GR/3FmhlHy+A3SZ?= =?iso-8859-1?q?bftJ/TqZd+iCLHG5BnhikAhXR4hAjDbCKxl2r6RmRmRnnn1qswMRY0j7nZ3/?= =?iso-8859-1?q?xFrTN9p6m6HyoC7zces8hXLALSE6074GKJ16LYh/3tAn5Y5SEoi7BEKmkHdL?= =?iso-8859-1?q?FTH+cp3tVI3qztOb3A8wOi5gEm+kKDdO5rTCHNd97ecU5KWIsqk5vGaWQEqE?= =?iso-8859-1?q?FRv8CEiYA6yn2bnS2AOBRbeJtLiIk8P5b6fBdlp9PPFEVZjo3Geypuydqa86?= =?iso-8859-1?q?Iy6Yp0EuL80jDjw8+zDKQAvV6/APSiW1gSIQBmalzd5hHgWQxxeMU45HZVQh?= =?iso-8859-1?q?4ZluT+Ccg+06NkPZh+SnotD58CARpOTvY5QoewZh/007HwiQOGEtWzpU7xlQ?= =?iso-8859-1?q?6lWEbHqDi/Ssw7sUJqygIR/OJcJ3tN5QBVx1aVgrmTWDgPqc3539Kb3PtDX8?= =?iso-8859-1?q?aZxRCFTfyjBGr+q9kiqEu+3Q3TksTz0r9V0mM8ej6f/bdKPt++whS3EIEDRu?= =?iso-8859-1?q?gs8TPB9za+NV9QBSHW804eo7l2+C5LdhkI7mQUFirRrxW4VMlcaiVm6Id17w?= =?iso-8859-1?q?wjqDEzVOGqK4dSdvnVE/IN6nBhawLXHtZLWAPqOI+OcZlSHNaqtkbdUDgVzv?= =?iso-8859-1?q?D6Yr4xL41rzS8CGy27tJLRBsMQZS89ZU3U/IyOpOH1M0sgTmlqf74We1adZ2?= =?iso-8859-1?q?WbYxqlvcXIl0bcUcgforz9EjcSzadqDUv5iTyVp0Cgz60iDuyhUMncAGORJj?= =?iso-8859-1?q?Xz5QzblbwbwHlN69OEKzcq5uoJdftmQbCMVsDav71ZoqJSrSJ0ar+mtlIEba?= =?iso-8859-1?q?+IcXpjj0UUlA0jgjnMYhS90eYz65Q/tZ59XR0ZAOR4T3fNBDbPhGD5EVqOLe?= =?iso-8859-1?q?R3R3dtZBrunXFeFh+V+Dj34xa5uX1rtl/fslwB3Td8wX10YKNNmhmjQFlkGc?= =?iso-8859-1?q?Gs7ggj0anP9YZMSuuAZRCQc63jNu0lDbSdBtJsvS9k+gYtGNaWZvtC3r4QrA?= =?iso-8859-1?q?xyStfQrxc/I2mz45NOFqjTVGKzQMQ5ZPIJiSj6w=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: mail.schwarz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: b610b5c2-a690-4f8a-becf-08dabd80347a X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Nov 2022 09:45:55.9957 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d04f4717-5a6e-4b98-b3f9-6918e0385f4c X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: rpOhCkxGGaL4w6KisVONWgrDsjy0/b+uMox6BxhJy2TxMKL3CQ/8yB8Otv6Zi6URwIxvSBAU6mqXgm691XPKeM29VTx6vPmCdC6N3TdtM9g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3624 Subject: [ovs-dev] [PATCH ovn v2 1/4] logical-fields: add rarp fields 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: =?iso-8859-1?q?Felix_H=FCttner?= via dev From: Felix Huettner Reply-To: =?iso-8859-1?q?Felix_H=FCttner?= Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" We need to be able to handle rarp fields in order to ensure we can handle rarp messages we send ourselves. This will be used by the next patch in the series. Acked-by: Numan Siddique Signed-off-by: Felix Huettner --- lib/logical-fields.c | 8 ++++++++ lib/ovn-util.c | 2 +- ovn-sb.xml | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) -- 2.38.1 Diese E Mail enthält möglicherweise vertrauliche Inhalte und ist nur für die Verwertung durch den vorgesehenen Empfänger bestimmt. Sollten Sie nicht der vorgesehene Empfänger sein, setzen Sie den Absender bitte unverzüglich in Kenntnis und löschen diese E Mail. Hinweise zum Datenschutz finden Sie hier. diff --git a/lib/logical-fields.c b/lib/logical-fields.c index ed3ec62e1..fc131791e 100644 --- a/lib/logical-fields.c +++ b/lib/logical-fields.c @@ -261,6 +261,14 @@ ovn_init_symtab(struct shash *symtab) expr_symtab_add_field(symtab, "arp.tpa", MFF_ARP_TPA, "arp", false); expr_symtab_add_field(symtab, "arp.tha", MFF_ARP_THA, "arp", false); + /* RARPs use the same layout as arp packets -> use the same field_id */ + expr_symtab_add_predicate(symtab, "rarp", "eth.type == 0x8035"); + expr_symtab_add_field(symtab, "rarp.op", MFF_ARP_OP, "rarp", false); + expr_symtab_add_field(symtab, "rarp.spa", MFF_ARP_SPA, "rarp", false); + expr_symtab_add_field(symtab, "rarp.sha", MFF_ARP_SHA, "rarp", false); + expr_symtab_add_field(symtab, "rarp.tpa", MFF_ARP_TPA, "rarp", false); + expr_symtab_add_field(symtab, "rarp.tha", MFF_ARP_THA, "rarp", false); + expr_symtab_add_predicate(symtab, "nd", "icmp6.type == {135, 136} && icmp6.code == 0 && ip.ttl == 255"); expr_symtab_add_predicate(symtab, "nd_ns", diff --git a/lib/ovn-util.c b/lib/ovn-util.c index 5dca72714..597625a29 100644 --- a/lib/ovn-util.c +++ b/lib/ovn-util.c @@ -817,7 +817,7 @@ ip_address_and_port_from_lb_key(const char *key, char **ip_address, * * This value is also used to handle some backward compatibility during * upgrading. It should never decrease or rewind. */ -#define OVN_INTERNAL_MINOR_VER 4 +#define OVN_INTERNAL_MINOR_VER 5 /* Returns the OVN version. The caller must free the returned value. */ char * diff --git a/ovn-sb.xml b/ovn-sb.xml index 315d60853..42e6fa3ee 100644 --- a/ovn-sb.xml +++ b/ovn-sb.xml @@ -1052,6 +1052,7 @@
  • ip4.src ip4.dst
  • ip6.src ip6.dst ip6.label
  • arp.op arp.spa arp.tpa arp.sha arp.tha
    • +
  • rarp.op rarp.spa rarp.tpa rarp.sha rarp.tha
  • tcp.src tcp.dst tcp.flags
  • udp.src udp.dst
  • sctp.src sctp.dst
    • @@ -1115,6 +1116,7 @@
  • ip.later_frag expands to ip.frag[1]
  • ip.first_frag expands to ip.is_frag && !ip.later_frag
  • arp expands to eth.type == 0x806
    • +
  • rarp expands to eth.type == 0x8035
  • nd expands to icmp6.type == {135, 136} && icmp6.code == 0 && ip.ttl == 255
  • nd_ns expands to icmp6.type == 135 && icmp6.code == 0 && ip.ttl == 255
  • nd_na expands to icmp6.type == 136 && icmp6.code == 0 && ip.ttl == 255
    • From patchwork Thu Nov 3 09:45:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1698803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=akR2FZmE; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N2zRC6sGQz23lK for ; Thu, 3 Nov 2022 20:46:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9819860FD8; Thu, 3 Nov 2022 09:46:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9819860FD8 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=akR2FZmE 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 5t2OMrpsEzsm; Thu, 3 Nov 2022 09:46:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id CAE6160FC0; Thu, 3 Nov 2022 09:46:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CAE6160FC0 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B83ADC0083; Thu, 3 Nov 2022 09:46:06 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 154DDC0033 for ; Thu, 3 Nov 2022 09:46:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B108840951 for ; Thu, 3 Nov 2022 09:46:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B108840951 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=akR2FZmE 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 xJlFFmNiF_4U for ; Thu, 3 Nov 2022 09:46:00 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6567A40977 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2115.outbound.protection.outlook.com [40.107.21.115]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6567A40977 for ; Thu, 3 Nov 2022 09:46:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iRrZDYRy3DgaN+aoz3vX6SgflPSIjXq2MIhuZQVBjiU8pmtddl84Vg+2vg6HcJeiLYIDR1TWTcX2tZyDA+oTKgg2EElHeun1tukMOJdArcABNahA4Vh0H37N7AAyx0p7HjWAOYb09e7A2jTiRd5Mz3hURelUJY2gsjeTNwqA77DKSNxMKSU80+RphHtJFOj/iH6l4hdeGP6dWNTqlgLpki7iVTXJKwT90C8wKnz9pP3KA200tICs06LfJao1VdT4DtgZeW+QltR1sXhzm5mm5uWxCAo9ejiH4mVilxFSHHF+IgHgdJEAzsOsZ3OnlqOWly0ZSg4WYYcd1CWdkk9Uig== 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=cCIkaFQ43awnJtS9vDlqr+s0mL1nOfnEvyZac1YVeC8=; b=mP0KqsbWGKpM9fE7RkvEQlWXQZjp38Tw+CPQxYkoCOkTMC6pkAlzwD7rqgO2UwcOo/GIW5B6knlcM89ENgx8Oa21tTFB6X79GN75R6hDfpenPPoJhvQq3yKpHtypJnCmaUb1xIwWKfKyysabJC2JvqXZw9CjfNQ1/7YohIgC8aDCgbgsGmOIXaAVQDC8WepoxqlkBhUGeqODk1LpSdBCv0di+Ld0NSaP9kNycPA8Bf4rN8xnRYXHXp7Z9PNsG56nQ5gK5p4eRg7unmf1gtVIxeZM42moo/oFASCZLVVN0bedNDVWM8krQu4DvX7MINarx0zsUJwks/zoz6zn+TcsrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mail.schwarz; dmarc=pass action=none header.from=mail.schwarz; dkim=pass header.d=mail.schwarz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.schwarz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cCIkaFQ43awnJtS9vDlqr+s0mL1nOfnEvyZac1YVeC8=; b=akR2FZmEyVmNZoxOxzSjiHD9R/i7xj7MU2qxLK5GCYyb1t3Tk/paVdSKTYHshrwpe3UfYnqaxkwsXjh2J95Jol1OGrCtyHLpmRpmHTRnWaoaD59+ZGtKl6BHRpLtkBrCDs4PwDOtD//ZbhCiQUntVcuLYxjIc88qmDr+suNq1EpHY8fvya0kqb7lODpDmgtgkze4FwZW0qqGpb6LcPxKGXt7neHN8zjyyHnqvduUw3X6eXGeur6lwGNggBCrFPhUrP79wjVJUmd1PvwGzzRqF+huBatv0kKQqhvCmZG9+to3af7TiCoomBHEn/7yyBcMjjUduI6U/LsafzNBVc2bDw== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AM7PR10MB3624.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:13e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Thu, 3 Nov 2022 09:45:58 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b%6]) with mapi id 15.20.5791.022; Thu, 3 Nov 2022 09:45:57 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn v2 2/4] northd: handle own rarps like garps Thread-Index: AdjvaNKixBYw9+rVTPiklNWGUrFa8g== Date: Thu, 3 Nov 2022 09:45:57 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mail.schwarz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DU0PR10MB5244:EE_|AM7PR10MB3624:EE_ x-ms-office365-filtering-correlation-id: f7746b41-9487-47d5-9079-08dabd80359d x-mp-schwarz-dsgvo2: 1 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zPgOVUFv/AN3FZ7WpV72/U2EZbx1XDW0Cg2wvU9wpy72Eqi68gwuD1vP6FSsX28D/xJeS52o5o57QHR4XAyYOL3WUv0Bj3Iul+r3PtewaI2CZTkDLtDKP7XwpwmzqP3+S0XldXMay0eNUFwdkZayoosyfgrOhNT9E2DHAVCKDShbNOSw6TYmGluS+QKGt9NWIofCclfjoy6utj7799wr71JUkXbmwY3Adg7B+pN6JQ2KImyrKlFLj2SPHw2RDbodUf1e/kHqrctw2BQ9YYd/FS8STJu1DOwCjnh2S8eK2ynZswjIsWBx67ylcFMlop/m8k9EepEaGZBYICe5+enbymPRjvFfvf9EXLo3oZ+JCiqY5i78DoaS34K1Fx8/X+hrZRBR046qrjuRn/085vRbsRV0+gfPSTk4iZihYRz1Egq96JQyERVIOg80dp71Hhx4mrMjUtw7zwXcYDKUopEj4rXLG5qhZloI21cFKWb6nLKqfQ4X2cPa6OAIVWCKAbBCe48nas/YPSogwdQy8EuKEjU1rKOlllvO8z1ZMSbdPPJar+7DmkOl+lFcg2FeYfyGkmjEB71nQN0OIbZaxrVfztFYGBDJN+cY37UuolcOqS+Bw99qRQieLNQ3SzW6xoOG08pLKrey3YtvWhhs3s+WVf0YmEaujqI2LmJWPdGwVuTKNxnUGvOFWMBOCNkDcfhZSp6PdY85ieqUlrraVsdjX2/p4aH9vercm+L0RZxBpH+lvD8muk5DwBqNTay6GOu/wx4yWdjb45fGQYQak4PWOsFrhfy5SH5901WDvckFgDw= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(186003)(83380400001)(9686003)(7696005)(6506007)(26005)(82960400001)(66574015)(2906002)(30864003)(55016003)(5660300002)(66556008)(6916009)(316002)(478600001)(71200400001)(41300700001)(8936002)(8676002)(76116006)(52536014)(66446008)(64756008)(66476007)(66946007)(33656002)(38100700002)(122000001)(38070700005)(86362001)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?/Zo+n/TM96DBQvohbga24j3?= =?iso-8859-1?q?Y1Xb1s3ZVTYQSifUuJqOCAfdQx1p+Q+30KHQQpiUqgHHSGEoejUDyfc1lCWu?= =?iso-8859-1?q?Ah1mYx6LKynm7MYK50TCTP9e684hjVPRHdwwYBiRAF3GhTwp13y20+BwUVY8?= =?iso-8859-1?q?bwa6NmHs2DE79ZlJiHrz/ZmSYJnDBdppT9FggavDNOMUuAvZ/HEVEf4GVllN?= =?iso-8859-1?q?lhi5j/sU6+dp+P7g/Q7R1zGOuCy15HEz63XAzZM3TMUFA/wbV6e7Q1J0U+f8?= =?iso-8859-1?q?UHKyt8RJX2AHcak6sCGBN4zRSKwvi4KnR5sbATy1O7MbN8xYa60PbepeREOn?= =?iso-8859-1?q?6kf7uJMGZ+usZNHjsPhTFI64oKR4xpqqU4C6C/gnfHQc02PCQG5Bxb0841cw?= =?iso-8859-1?q?uIwzysO9b/bC48j5hFsggK+Y6X4da4cV4/LvsIELeH8n+EyOJB/tVvwPf6Q5?= =?iso-8859-1?q?pzj2lUsy5G0a0ian7guC89TYLFzXQNphu3dOaox9bMgt4ItZeBNeYmj6kkp1?= =?iso-8859-1?q?Ilj3Joth6DWcmRo4LWhkcWXZHpOD/d7+7XHdiWbMhDkjxm/Akh64JA5s6IDJ?= =?iso-8859-1?q?zei14Y3lGafLnDxpR9ZB8/zcK9IEXK5WRHmGnWPK1MIbSTO7+tek+2uEwtfA?= =?iso-8859-1?q?ks6NsjVK4VGbgj9ongnkBbhwVopj5fl9oEYcXNFmoOh1SyHRu55KrVDy7Vr3?= =?iso-8859-1?q?gwptBwKQQXb/iWE5kJ0gMbCqRJ1obVDutPIWDHO4nU4JQ1dYlwAY8JOolntv?= =?iso-8859-1?q?veFUE9FNsLy/vG1urjIlcyA1a51v6zhJ3qVwf0s+VxwwH+XewPF/vO8nRvnO?= =?iso-8859-1?q?1QaMmSGnvqLah/m6Dfiq+4z31TCZgAnPnW2OHpAL1DMw4il5iVifRpQEvg9s?= =?iso-8859-1?q?6sfouE9jtQSvNN4qaY99gm+uGorniMFiZwAPuaJcMBJzzM4eOB+lHtL9oiyI?= =?iso-8859-1?q?XHvsdGPu6dIbtf2OAzzsa48zARjBzW644AP+fTqGZrrtPvViXgiWlAvsP6qq?= =?iso-8859-1?q?OPj2T2nbQkmOdxBIjFAVenTHXlK6Sc+pUguW4VhUYgW+UuO5mo5PsDfjGmIe?= =?iso-8859-1?q?Z2KyOK61Adkg9KVNWLNZisJfglcgwStQg+L/HIfmXlD9ays66dQInyvsp9Oq?= =?iso-8859-1?q?z+lcNPuS1HQ0A8fnfDcNiwLSGuW/e/FZZpktjDH7Zw0EkrpKerBnzdtr0HjY?= =?iso-8859-1?q?OGoSpwWrEjjXufXNCcjYs1U6Rw6nwdkjUQvUFMCsvjo0iSuYTLAJn2X5vbLr?= =?iso-8859-1?q?zW3krI1bgPy5lVsJMMSJiv//ZvId20d9lv41/Nys/f/UrNFt6+shjaVAuOPX?= =?iso-8859-1?q?K2tFsLQUT1ohGMl2JH6pGYQzeP34+vbiAweAtTWi/XFyibwTBx1nKzfW129O?= =?iso-8859-1?q?AFmConYACyUQy4fqe6qtoV7r3ZvsSr/k9mWJxPjdxdkvxHmohwOfZqTMVWN2?= =?iso-8859-1?q?drrmaoaGIMTqOj+jCRIFfG70SliBZLD+0/5zh4f1zKJf6jQ9ESBJSZohd/J3?= =?iso-8859-1?q?BzfcOIR5zKwtUINhe95UYBCqwAWfQv8gfcslTRaO6awHNjp2+pjCNka/Gs2y?= =?iso-8859-1?q?Q4/n28O0LF6ogCjpoetWAXEj1bmwJuBHD89O/mD9T72wtio7aoRPEhIXXxfa?= =?iso-8859-1?q?iuh2GCPrclXKJezi4kEA2Ti4puloyG1ieEE26dQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: mail.schwarz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: f7746b41-9487-47d5-9079-08dabd80359d X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Nov 2022 09:45:57.9172 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d04f4717-5a6e-4b98-b3f9-6918e0385f4c X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Ca+mlCxOgIse0SDT8AfAuF4gdJrj3ZjzCzynIoIidqTEMT08Awz3BSrR+5r0GcYu+AiopziQyZT2THXHg3ptHcRSJs6k003OSFIap5rhaUA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3624 Subject: [ovs-dev] [PATCH ovn v2 2/4] northd: handle own rarps like garps 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: =?iso-8859-1?q?Felix_H=FCttner?= via dev From: Felix Huettner Reply-To: =?iso-8859-1?q?Felix_H=FCttner?= Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Previously graceful rarps sent from ovn-controller were handled as normal packets and flooded to other routers. As the other routers should already have that information, we can skip flooding (just like it is done for GARPs already) and thereby mitigate ovs refusing to send the packet because of too many resubmits. This change has been tested in combination with the previous one in the series and works well in environments which contain an external ipv6 network with 600 ovn logical routers. Acked-by: Numan Siddique Signed-off-by: Felix Huettner --- northd/northd.c | 11 ++++++----- northd/ovn-northd.8.xml | 4 ++-- tests/ovn-northd.at | 18 +++++++++--------- tests/ovn.at | 8 +++++++- 4 files changed, 24 insertions(+), 17 deletions(-) -- 2.38.1 Diese E Mail enthält möglicherweise vertrauliche Inhalte und ist nur für die Verwertung durch den vorgesehenen Empfänger bestimmt. Sollten Sie nicht der vorgesehene Empfänger sein, setzen Sie den Absender bitte unverzüglich in Kenntnis und löschen diese E Mail. Hinweise zum Datenschutz finden Sie hier. diff --git a/northd/northd.c b/northd/northd.c index b7388afc5..e1f3bace8 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -7336,8 +7336,8 @@ build_lrouter_groups(struct hmap *ports, struct ovs_list *lr_list) } /* - * Ingress table 24: Flows that flood self originated ARP/ND packets in the - * switching domain. + * Ingress table 24: Flows that flood self originated ARP/RARP/ND packets in + * the switching domain. */ static void build_lswitch_rport_arp_req_self_orig_flow(struct ovn_port *op, @@ -7369,7 +7369,7 @@ build_lswitch_rport_arp_req_self_orig_flow(struct ovn_port *op, sset_add(&all_eth_addrs, nat->external_mac); } - /* Self originated ARP requests/ND need to be flooded to the L2 domain + /* Self originated ARP requests/RARP/ND need to be flooded to the L2 domain * (except on router ports). Determine that packets are self originated * by also matching on source MAC. Matching on ingress port is not * reliable in case this is a VLAN-backed network. @@ -7385,7 +7385,8 @@ build_lswitch_rport_arp_req_self_orig_flow(struct ovn_port *op, ds_chomp(ð_src, ','); ds_put_cstr(ð_src, "}"); - ds_put_format(&match, "eth.src == %s && (arp.op == 1 || nd_ns)", + ds_put_format(&match, + "eth.src == %s && (arp.op == 1 || rarp.op == 3 || nd_ns)", ds_cstr(ð_src)); ovn_lflow_add(lflows, od, S_SWITCH_IN_L2_LKUP, priority, ds_cstr(&match), "outport = \""MC_FLOOD_L2"\"; output;"); @@ -7581,7 +7582,7 @@ build_lswitch_rport_arp_req_flows(struct ovn_port *op, lflows, stage_hint); } - /* Self originated ARP requests/ND need to be flooded as usual. + /* Self originated ARP requests/RARP/ND need to be flooded as usual. * * However, if the switch doesn't have any non-router ports we shouldn't * even try to flood. diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml index a70f2e678..051f3dc6e 100644 --- a/northd/ovn-northd.8.xml +++ b/northd/ovn-northd.8.xml @@ -1723,8 +1723,8 @@ output;
  • Priority-75 flows for each port connected to a logical router - matching self originated ARP request/ND packets. These packets - are flooded to the MC_FLOOD_L2 which contains all + matching self originated ARP request/RARP request/ND packets. These + packets are flooded to the MC_FLOOD_L2 which contains all non-router logical ports.
    • diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 4f399eccb..e849afd85 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -4759,7 +4759,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls1_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:01), action=(outport = "ls1-ro1"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:02), action=(outport = "vm1"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.1), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && nd_ns && nd.target == fe80::200:ff:fe00:101), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) ]) @@ -4771,7 +4771,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls2_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:02:01), action=(outport = "ls2-ro2"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:02:02), action=(outport = "vm2"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:02:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:02:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.2.1), action=(clone {outport = "ls2-ro2"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && nd_ns && nd.target == fe80::200:ff:fe00:201), action=(clone {outport = "ls2-ro2"; output; }; outport = "_MC_flood_l2"; output;) ]) @@ -4791,7 +4791,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls1_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:01), action=(outport = "ls1-ro1"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:02), action=(outport = "vm1"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 10.0.0.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.1), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && nd_ns && nd.target == fe80::200:ff:fe00:101), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) @@ -4804,7 +4804,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls2_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:02:01), action=(outport = "ls2-ro2"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:02:02), action=(outport = "vm2"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:02:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:02:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.2.1), action=(clone {outport = "ls2-ro2"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 20.0.0.100), action=(clone {outport = "ls2-ro2"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && nd_ns && nd.target == fe80::200:ff:fe00:201), action=(clone {outport = "ls2-ro2"; output; }; outport = "_MC_flood_l2"; output;) @@ -4825,7 +4825,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls1_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:01), action=(outport = "ls1-ro1"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:02), action=(outport = "vm1"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 10.0.0.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.1), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 30.0.0.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) @@ -4839,7 +4839,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls2_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:02:01), action=(outport = "ls2-ro2"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:02:02), action=(outport = "vm2"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:02:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:02:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.2.1), action=(clone {outport = "ls2-ro2"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 20.0.0.100), action=(clone {outport = "ls2-ro2"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 40.0.0.100), action=(clone {outport = "ls2-ro2"; output; }; outport = "_MC_flood_l2"; output;) @@ -4858,7 +4858,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls1_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:01), action=(outport = "ls1-ro1"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:02), action=(outport = "vm1"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 10.0.0.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.1), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) @@ -4876,7 +4876,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls1_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:01), action=(outport = "ls1-ro1"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:02), action=(outport = "vm1"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 10.0.0.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.1), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) @@ -4900,7 +4900,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls1_lflows | sed 's/table=../table=??/' | sort], table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:01), action=(outport = "ls1-ro1"; output;) table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 00:00:00:00:01:02), action=(outport = "vm1"; output;) table=??(ls_in_l2_lkup ), priority=70 , match=(eth.mcast), action=(outport = "_MC_flood"; output;) - table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) + table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:01:01} && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 10.0.0.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.1), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 192.168.1.100), action=(clone {outport = "ls1-ro1"; output; }; outport = "_MC_flood_l2"; output;) diff --git a/tests/ovn.at b/tests/ovn.at index f8b8db4df..184fc0fdd 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -24176,7 +24176,13 @@ nd_target=fe80::200:1ff:fe00:0 # - 00:00:00:01:00:00 - dnat_and_snat external MAC. # - 00:00:00:02:00:00 - dnat_and_snat external MAC. as hv1 -AT_CHECK([ovs-ofctl dump-flows br-int | grep -E "priority=75,.*${match_sw_metadata}.*arp_op=1" | grep -oE "dl_src=[[0-9a-f:]]+" | sort], [0], [dnl +AT_CHECK([ovs-ofctl dump-flows br-int | grep -E "priority=75,arp.*${match_sw_metadata}.*arp_op=1" | grep -oE "dl_src=[[0-9a-f:]]+" | sort], [0], [dnl +dl_src=00:00:00:00:01:00 +dl_src=00:00:00:00:02:00 +dl_src=00:00:00:01:00:00 +dl_src=00:00:00:02:00:00 +]) +AT_CHECK([ovs-ofctl dump-flows br-int | grep -E "priority=75,rarp.*${match_sw_metadata}.*arp_op=3" | grep -oE "dl_src=[[0-9a-f:]]+" | sort], [0], [dnl dl_src=00:00:00:00:01:00 dl_src=00:00:00:00:02:00 dl_src=00:00:00:01:00:00 From patchwork Thu Nov 3 09:45:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1698802 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.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=bIUSSSTB; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4N2zR93lzrz23lK for ; Thu, 3 Nov 2022 20:46:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 41329417AC; Thu, 3 Nov 2022 09:46:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 41329417AC Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=bIUSSSTB 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 rXDGyyfjaaoL; Thu, 3 Nov 2022 09:46:08 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 2B5694179A; Thu, 3 Nov 2022 09:46:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2B5694179A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 12F71C0080; Thu, 3 Nov 2022 09:46:06 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id DB358C0033 for ; Thu, 3 Nov 2022 09:46:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6AA184098B for ; Thu, 3 Nov 2022 09:46:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6AA184098B 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 IZVDm4cN7-A1 for ; Thu, 3 Nov 2022 09:46:01 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org EA8E9409B2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2115.outbound.protection.outlook.com [40.107.21.115]) by smtp4.osuosl.org (Postfix) with ESMTPS id EA8E9409B2 for ; Thu, 3 Nov 2022 09:46:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H35Je5URrfpMYvbf3/1z/+eva5wM1r1BKFCuzpoVby4dQXNvt88L4u1vWCynHsWwJBHzq+SsVZ1eVmx3AG3+Q77JHagXr3KO9Vb1mmK2BiuiyrRXqzP8rztm8byYTpnICrsMs+JjJVtUPIiz/C4yE7Et3PYLiQP5+w7ceuGeb2HMCw4VcbwgXRnuiG/UcBoLyXIn16eF1S03Dsc+sWxWxRUw2/qMmjU7DsYVkwx3/tXpJF4iNh7dEgMOnW77aGZ6Ugvrjl+vTwv1oGusMO3cSSoVng3hhXBI+r3oSF9ox4INIkJcVpy8FwFNJOchytOd9ht09Ff8zfguLdFpS8KNTA== 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=zHlgnFvDkt+kyIShrlX39PZhZYEwlfsCRkmH5HZzZYk=; b=JUKRbPGFqfqKUiRkXL3bRoFuow5EFNdxDbmqgxlypq1sD3XrAn4TSFqgCWtQ8zE2b6VxyJQlNaczHUl8KLXxrV23Uyl6RqN4xafYu+o2UNz2diYzM7rpSFqDiBhyKkm62grqPWFquFHRLpDVp9MjmGAeD8Ut8F0tp+hVdUJLa9ieXWEaY9Sh5qaGmrV7K/abwZX/lScYG/BnIo4j0FOOYvzGitzmIHvAb4QHuThcU1mPjXRlCi44K8cr+UsEC4+81pyB7FbfFhXUKYozvD7RfTSoutIrpFKYmbd0+2o38lHkZsz6HjMUZrHjmuUQd4/E+2BuwcXRnG7Kaugk6aCDuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mail.schwarz; dmarc=pass action=none header.from=mail.schwarz; dkim=pass header.d=mail.schwarz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.schwarz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zHlgnFvDkt+kyIShrlX39PZhZYEwlfsCRkmH5HZzZYk=; b=bIUSSSTB+Z9Zr6oLKAcu3DHOoLSbm9Gv5usSc/fzPMoMsZLoHwvVn4N/skrMaDPEbOBrknDHcmQgV7LWrtlYSfdbkLynLa77uiX3QWc2+EayauNCil7Oukn81XI2ABTJJiiVRfkvJkc/B71J9QNwxhwI4Lq2jyb/vBS+sQe86gMOQFZZ5Y7rwzOufSgxf/b3h9ZKQJK3+NRXzjQ/mUxxp4JT2Ltc1Ljray8JUw7hOY/n7Wp/V1iah9XQ9zKP6d/aUupB7YlZRXIileo+Is9iKrrJ1AgtpsgpEX1VjCQzhPdXV+JrlcSLO6Q5bdPnFaDpgUOcGUsTJ+IX0Ug7/Vl9eg== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AM7PR10MB3624.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:13e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Thu, 3 Nov 2022 09:45:59 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b%6]) with mapi id 15.20.5791.022; Thu, 3 Nov 2022 09:45:59 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn v2 3/4] ovn-macros: support ipv6 in ovn_attach Thread-Index: AdjvaRLjxpHzWtUkSH+nv0xi+D5HGg== Date: Thu, 3 Nov 2022 09:45:59 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mail.schwarz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DU0PR10MB5244:EE_|AM7PR10MB3624:EE_ x-ms-office365-filtering-correlation-id: 7eba6d0d-70c3-40c4-b386-08dabd803687 x-mp-schwarz-dsgvo2: 1 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: XvAhoebqrHFWK12DqHz6wKxzR+sgAmhXHbYHLQYLoDMkv9Ow2LU1K0IA6JRsRpX9gQgYJ7ZPRDdAUozE0YQKXAQBqrwUfG5SZ2f+Rwo8ClmKrb4K3d//UE/1O/hUsoie1ro5IIY+aTShoBLNMsigZ4MxeGQnQ2MSn0iw/AXQs5PEkrgfgLjjy+uysWpwJ5tZwkN2CSDeuYmKlRcGC8FYnPGs2aCfERZINFkiY03UHMTIRzBktd/5ZKFq6MkZUeGPXrHUmRD+tt417PHk4RWc3CUIN7UpmVtg+BkwKn9JPg5qoNM4XSbJDk5jqnqycxwRq2qtganqprgZLz0bSUV0shPlNi/8Emc5SgOewLzyi8ic1ZJwQl3bLn51WhMtSNRVwuOD0C/NHWg0/bW70/2uetLbyKTI2yH7cSNAN8GAt9BURW36qqE4T/04B//vtalKueOllxNz+g5xm7YoWf3jk/yGLUQtHF/D0JmN1qZLvtFTD0AOMRdXA77kdpBvIayRLuSgf40U1M7QzvOHFK5dXtLuI92JGj0bXkurqEGCZ0IbSdpYo8Z8BM1yjAYuJ8WoFrQ3AlJmMAhr0RBUzewZNS46WE+rA75RYl/FcMwXHUKcW67lGw/IOl3cWnVDfqPkkd9NOMqMNNFsBOFQ98EwCWtPCUyuuaVXk7S9Fu0K9+cKWl2rnau3+Mp8jTKGF5V5j5NA4bMt9mStTCwX0/tMQJUtRro1yAVVN6YamMDzqFc6NIvAOPG14o0iipQf4TLeeNieEA18/0uroH2bMn253yS7FFolvdeDgCShp3XFjls= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(186003)(83380400001)(9686003)(7696005)(6506007)(26005)(82960400001)(66574015)(2906002)(55016003)(5660300002)(66556008)(6916009)(316002)(478600001)(71200400001)(41300700001)(8936002)(8676002)(76116006)(52536014)(66446008)(64756008)(66476007)(66946007)(33656002)(38100700002)(122000001)(38070700005)(86362001)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?qVnYS63LQ5x7ufLjgM5MZpM?= =?iso-8859-1?q?bbLQfbczFtwyQ7jfLFVkHHUIwoP8c2L5a859dHI673Zi70Ae3k+UNkQf3bPq?= =?iso-8859-1?q?OiW53b6R6BpTTuBsbfVZACrEeHQPLoLkxRlDOyK5yGQSu3C2Jm3tBEEdYXWt?= =?iso-8859-1?q?OSmoWfTXeM1DIsljPMFusbSY7tSdrq4lsJUxP0e2w2uspWX1WtOxAA4BoNcK?= =?iso-8859-1?q?nFrv4ai+S0i7vbWP3kL0h1g3/+nKRSxajEcJeUJO3yfleOccYLYDYqr0DRCB?= =?iso-8859-1?q?suguvRXRyAjBI8AzjWSS+Ax2x/ccytw4fhS8k8WwcBLRymmTmiQT1pEjpdqK?= =?iso-8859-1?q?zr5EVrKlxP8feqGBNLyPOeNrdV4Z1UeQQfUHJAsvKswbRTc4NRW7uEAHEF9l?= =?iso-8859-1?q?mMH8IvzQvg6FFD0+mkuexuj+NFdBVVTxO7zFp+TAGdu34IZvzZQyjJZK84qA?= =?iso-8859-1?q?OBK8RcAEu+Orki4UUUkV0c3NY/kV0VOhmbPwk8Zvk12LIpIsrRa4GuJuxvSK?= =?iso-8859-1?q?6r6/IpQH1Rk70BqDkPZdRNrtZRYT5k3mWlrFzP1L/hMapvsfV6IMSnl+ONmI?= =?iso-8859-1?q?l7r19SsFK3WB+85OHtUHUXswb61bHQooPrbipi3DEysIitoM6SyLU0rWKW9b?= =?iso-8859-1?q?brxmwxMfQ5AlL6e2qvGKrpLFijN8m1mW3MsjauZKfWRX3LVisIqdcLUC1pRh?= =?iso-8859-1?q?s7NEzIznpTgLU/rfOWtPKxht6WvAIB6coMS3z9eQsfdrG/TdXyqREi6hs/C7?= =?iso-8859-1?q?gXVe9/dpJ/E7pgJwLon1O03E9Lm1sPyZzTSdS3bb3B2iKGOf+0k70iBw49/x?= =?iso-8859-1?q?onq3Bqyhzps7fTjnkT9MTX9zHDOZz+0XJIslifRq7xbAjQbYQySeFw8Y4jow?= =?iso-8859-1?q?oKI0stuqNiH2mKG3fT1PFNRnxvlfljbtkp8gbKC7I/NoQ97YfAWBK758xQAu?= =?iso-8859-1?q?I4kmbOxc3KaSqW9JR+YR9aW2AFPGQOmCnL1DXPHeaVUOd78QI5YwPw02PoSi?= =?iso-8859-1?q?tjWHnfa9d5BGRUCpN6BQbNrZQHbqVqiRsqkfeAocCgRbpkrP1JpSgyN9rLkI?= =?iso-8859-1?q?jqpqt0VgiGZvkJeeL+eUkhS5jx5cdyXLk+oHyp0Sl+7l5imBg95ub5T6WkhM?= =?iso-8859-1?q?03FoAWq7a1wUcQe9ypwHi+5gHQGGhTE92mEQS3URAgX2i+FM+0s+N1SbE97K?= =?iso-8859-1?q?pnRCUa/Zl2nSnTRvlHpByJGJ7sxouiDMpJ3EkwBhHBDp2wFcoVOdcUo9ALnu?= =?iso-8859-1?q?Q2XgAm9Qq09FdoNWcT5FHOxyLNUaMshbtLua5bLr8A4WsbyoOTO1vQjuAvoP?= =?iso-8859-1?q?OfgrJSbuB0Ff712tkdLGvnZ6CTYvHHNGVKjEStmioKCRHX5meHwHMo0nbje6?= =?iso-8859-1?q?6bkyN0Z1AkD2I7FJ1KNrzxA2LrNwUpr1W2sDDhaQw8p53A7I3WICemd3nbaa?= =?iso-8859-1?q?Ys7+U0XM5OCP46ftlSiHG7fmyBe+lE87HsZJ+cr6stMhom6fxIjumEdKzT/2?= =?iso-8859-1?q?VdSICKnoAaDlSuxcZ50G4p9/OFN3gzD1RIQl3JeXFqn1vz6YIJSC7Ygt7UrB?= =?iso-8859-1?q?GOr0J2fdYprTqhjTbLWa5EHAzfleG9m7TCk2sGqKq0kqwDh1wYi2lG1SAFvF?= =?iso-8859-1?q?yQ2eeD780ULcEa84IpnhvFY3ABT5iiZBJS57hCw=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: mail.schwarz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 7eba6d0d-70c3-40c4-b386-08dabd803687 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Nov 2022 09:45:59.4203 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d04f4717-5a6e-4b98-b3f9-6918e0385f4c X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: a/TvUMgBZq8PbclxBT2qdK0oPA7/jYM1IawtupgIXGWnHa39inTraxFolET+arZS0e0KexOWxnwnu+1632TDtqpEwo+zBgWuzWtC6+MYXUY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3624 Subject: [ovs-dev] [PATCH ovn v2 3/4] ovn-macros: support ipv6 in ovn_attach 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: =?iso-8859-1?q?Felix_H=FCttner?= via dev From: Felix Huettner Reply-To: =?iso-8859-1?q?Felix_H=FCttner?= Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" in order to easily add future ipv6 test cases the common `ovn_attach` function should also support ipv6 addresses. Acked-by: Numan Siddique Signed-off-by: Felix Huettner --- tests/ovn-macros.at | 9 +++++---- tests/ovn.at | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) -- 2.38.1 Diese E Mail enthält möglicherweise vertrauliche Inhalte und ist nur für die Verwertung durch den vorgesehenen Empfänger bestimmt. Sollten Sie nicht der vorgesehene Empfänger sein, setzen Sie den Absender bitte unverzüglich in Kenntnis und löschen diese E Mail. Hinweise zum Datenschutz finden Sie hier. diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index b234019a9..9c7f60113 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -288,14 +288,14 @@ net_attach () { || return 1 } -# ovn_az_attach AZ NETWORK BRIDGE IP [MASKLEN] +# ovn_az_attach AZ NETWORK BRIDGE IP [MASKLEN] [IPVERSION] [ENCAP] ovn_az_attach() { - local az=$1 net=$2 bridge=$3 ip=$4 masklen=${5-24} encap=${6-geneve,vxlan} + local az=$1 net=$2 bridge=$3 ip=$4 masklen=${5-24} ipversion=${6-4} encap=${7-geneve,vxlan} net_attach $net $bridge || return 1 mac=`ovs-vsctl get Interface $bridge mac_in_use | sed s/\"//g` arp_table="$arp_table $sandbox,$bridge,$ip,$mac" - ovs-appctl netdev-dummy/ip4addr $bridge $ip/$masklen >/dev/null || return 1 + ovs-appctl netdev-dummy/ip${ipversion}addr $bridge $ip/$masklen >/dev/null || return 1 ovs-appctl ovs/route/add $ip/$masklen $bridge >/dev/null || return 1 local ovn_remote @@ -329,13 +329,14 @@ ovn_az_attach() { start_daemon ovn-controller --enable-dummy-vif-plug || return 1 } -# ovn_attach NETWORK BRIDGE IP [MASKLEN] +# ovn_attach NETWORK BRIDGE IP [MASKLEN] [IPVERSION] [ENCAP] # # First, this command attaches BRIDGE to interconnection network NETWORK, just # like "net_attach NETWORK BRIDGE". Second, it configures (simulated) IP # address IP (with network mask length MASKLEN, which defaults to 24) on # BRIDGE. Finally, it configures the Open vSwitch database to work with OVN # and starts ovn-controller. +# IPVERSION must be set to 6 for ipv6 addresses. ovn_attach() { ovn_az_attach NONE $@ } diff --git a/tests/ovn.at b/tests/ovn.at index 184fc0fdd..3d54c9153 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3534,7 +3534,7 @@ for i in 1 2; do as hv-$i check ovs-vsctl add-br br-phys check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys - ovn_attach net br-phys 192.168.0.$i 24 vxlan + ovn_attach net br-phys 192.168.0.$i 24 4 vxlan done check ovn-nbctl ls-add ls @@ -3983,7 +3983,7 @@ ovn_start net_add net check ovs-vsctl add-br br-phys check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys -ovn_attach net br-phys 192.168.0.1 24 vxlan +ovn_attach net br-phys 192.168.0.1 24 4 vxlan check ovn-nbctl --wait=sb sync OVS_WAIT_UNTIL([ovn-sbctl get chassis main _uuid]) @@ -22432,7 +22432,7 @@ m4_define([DVR_N_S_ARP_HANDLING], ovs-vsctl add-br br-phys ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:$i$i" - ovn_attach n1 br-phys 192.168.0.$i 24 $encap + ovn_attach n1 br-phys 192.168.0.$i 24 4 $encap ovs-vsctl add-port br-int vif$i$i -- \ set Interface vif$i$i external-ids:iface-id=lp$i$i \ @@ -22473,14 +22473,14 @@ m4_define([DVR_N_S_ARP_HANDLING], as hv3 ovs-vsctl add-br br-phys as hv3 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys as hv3 ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:33" - as hv3 ovn_attach n1 br-phys 192.168.0.3 24 $encap + as hv3 ovn_attach n1 br-phys 192.168.0.3 24 4 $encap # Add 4th hypervisor sim_add hv4 as hv4 ovs-vsctl add-br br-phys as hv4 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys as hv4 ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:44" - as hv4 ovn_attach n1 br-phys 192.168.0.4 24 $encap + as hv4 ovn_attach n1 br-phys 192.168.0.4 24 4 $encap as hv4 ovs-vsctl add-port br-int vif-north -- \ set Interface vif-north external-ids:iface-id=lp-north \ @@ -22704,7 +22704,7 @@ m4_define([DVR_N_S_PING], ovs-vsctl add-br br-phys ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:$i$i" - ovn_attach n1 br-phys 192.168.0.$i 24 $encap + ovn_attach n1 br-phys 192.168.0.$i 24 4 $encap ovs-vsctl add-port br-int vif$i$i -- \ set Interface vif$i$i external-ids:iface-id=lp$i$i \ @@ -22745,14 +22745,14 @@ m4_define([DVR_N_S_PING], as hv3 ovs-vsctl add-br br-phys as hv3 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys as hv3 ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:33" - as hv3 ovn_attach n1 br-phys 192.168.0.3 24 $encap + as hv3 ovn_attach n1 br-phys 192.168.0.3 24 4 $encap # Add 4th hypervisor sim_add hv4 as hv4 ovs-vsctl add-br br-phys as hv4 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys as hv4 ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:44" - as hv4 ovn_attach n1 br-phys 192.168.0.4 24 $encap + as hv4 ovn_attach n1 br-phys 192.168.0.4 24 4 $encap as hv4 ovs-vsctl add-port br-int vif-north -- \ set Interface vif-north external-ids:iface-id=lp-north \ @@ -28487,7 +28487,7 @@ as hv1 ovs-vsctl add-br br-phys # Just set the encap type to be geneve for this test. -ovn_attach n1 br-phys 192.168.0.1 24 geneve +ovn_attach n1 br-phys 192.168.0.1 24 4 geneve # Get the encap rec, should be just one - with geneve/192.168.0.1 encap_rec=$(ovn-sbctl --data=bare --no-heading --column encaps list chassis hv1) @@ -31088,7 +31088,7 @@ for i in 1 2 3 4 5; do as hv$i ovs-vsctl add-br br-phys ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys - ovn_attach n1 br-phys 192.168.0.$i 24 $encap + ovn_attach n1 br-phys 192.168.0.$i 24 4 $encap done # Add a vif on HV1 @@ -32667,7 +32667,7 @@ for i in $(seq 1 $n_hv); do as hv$i check ovs-vsctl add-br br-phys ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys - ovn_attach n1 br-phys 192.168.0.$i 24 geneve + ovn_attach n1 br-phys 192.168.0.$i 24 4 geneve done check ovn-sbctl set connection . inactivity_probe=0 From patchwork Thu Nov 3 09:46:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1698804 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" (2048-bit key; unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=oLfZZ/9q; 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 4N2zRD4J2Dz23lV for ; Thu, 3 Nov 2022 20:46:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 701DF40190; Thu, 3 Nov 2022 09:46:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 701DF40190 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=oLfZZ/9q 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 eCwRsD_mkpA6; Thu, 3 Nov 2022 09:46:12 +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 4220E40B80; Thu, 3 Nov 2022 09:46:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4220E40B80 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A6964C007B; Thu, 3 Nov 2022 09:46:09 +0000 (UTC) X-Original-To: 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 724E2C007F for ; Thu, 3 Nov 2022 09:46:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4008181EEC for ; Thu, 3 Nov 2022 09:46:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4008181EEC Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=oLfZZ/9q 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 GudTasPIlTy9 for ; Thu, 3 Nov 2022 09:46:06 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B05EC81E5F Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2096.outbound.protection.outlook.com [40.107.103.96]) by smtp1.osuosl.org (Postfix) with ESMTPS id B05EC81E5F for ; Thu, 3 Nov 2022 09:46:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WM8XYB7Ysg8nKR608uA7APZYfJjMo5Ey//NyUrAzvU2YIDQmxmx4827cnwrNgC/RS+DaoAqMII9yCR8WBqr6UM+RLO6VJc9kmEN9dEaBr2u6k/NPiIHnB3TMylDuspRsm9nRurLQ3RmLwlyaO+CMdDO5uUtmCx8htCjbG63OO1rRatXUHjnwp0nBHhDJgAB48tupkABRJnO8Sotu8fQxIIvTIP/fk7T28fSVHrO1uXvkTHn36cqmIsavQFra+4uluwB5XZKgGnT5QpU0FlIde+GA9pE26t3usomMc5DeaNh6GwrNZBb4ChWJ2FLg8IhwZZcxDxTvGSgwtR7e9wLAYA== 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=oCrOEXWZ4oIpO2wMV/0sBdbwpeY0p6SmbTcgdx8Ax7U=; b=ki85omM6zINrPKuOUwlh1/NuHVS0S/Wrk6He7BVV9WlvPvSr+qVwb/LMIwC/NJt+33Uqf5/zpbO1+o+Un1ZXOljQcGGCm+avG2pLlDQbmsNKE+8fywTQm0+ntvXjUJakSTDfTkry02RDjkTBuXFAa52FtC9UPiUi5lRdwTNEbqpN+aBfPzmySt0+PtskXuSpZZuX1//F2/x3U3aXzU3XmvK3rmFnNrejvv49IJAEXTJIWT/hpP2qUyu6MNufduXFsHG8IPSxWMHfj0zMEVCd7+JJ2Lh0vMEUNwETgZwq8Xk2Sh7Y+p6Bi52/Gx3Kk9UJ/416NnLAW/cuIFD8UePhaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mail.schwarz; dmarc=pass action=none header.from=mail.schwarz; dkim=pass header.d=mail.schwarz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.schwarz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oCrOEXWZ4oIpO2wMV/0sBdbwpeY0p6SmbTcgdx8Ax7U=; b=oLfZZ/9q7EVwEYVcmZVokbR6Ut99aozkgZCG1zLMrIqfVEi21SqqWqaiiSkCgyS8Q4gvT9TxdkIIDiBXh72QUlm4tPH3Zyex4jw42TharTeeVFEitguNZ04BgGUecLuVU+xMVKRqzEZkUCe6N1rRV6S32z7jPEH5VrOw9egoZU0/GwNSnvj08wMSXwYxtjtBj5uJnAlTUT9exFp58uixGpkgcugfZjS0+gjtn6uQap3uXz/UV4qyyKXktrOYN9zCvJxFWYnm8ky8D/JqRZmz5GIxlnadxDpk/jRU5hKKLQV/i6odKkJ6lfVfVnLC+AN9HqHemYWtsMzMB8gMaEMKzg== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by PA4PR10MB5609.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:262::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Thu, 3 Nov 2022 09:46:01 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b%6]) with mapi id 15.20.5791.022; Thu, 3 Nov 2022 09:46:01 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn v2 4/4] pinctrl: Send RARPs for external ipv6 interfaces Thread-Index: AdjvaRPBUvlSbi+0TeKr/gtqdVNlXQ== Date: Thu, 3 Nov 2022 09:46:00 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mail.schwarz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DU0PR10MB5244:EE_|PA4PR10MB5609:EE_ x-ms-office365-filtering-correlation-id: ee53d3a9-03c7-4255-b240-08dabd80377f x-mp-schwarz-dsgvo2: 1 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Z3KRdN5QZCC8/jfEh2Gpk/+vaJwgVje1VCGIXD+YffpdVMXKx6dTwugEGCS1n5UOPZhnqigShDhi6gE7M22FnTc5QfhyJaRGy89sHOC9quInEfRwgGwH8lDQdvuLBsRKxEmqedv5LX73FLXjFkkVtYRaTc86Za4SKEcwq40q3xoAp5RxvX2u+kb1Lp/YKObO2dSqfz3n8o0vOlqTYKlu/O4Cse6UUtszm6pkkDz4Es/SCV6VFoyioGoG88cLa0JOFcA+Zc6E8bnX9TcHCmOFlaj5mACrDhkfTCqnOAJcFx1WZbM1arC1YNLKoWS0/xlqnGbUfC/o2dWG1oOkqbkRXd2vx+7KfsIuJJ96Tac+vQpskt078DXm6jxppNcieTChPIdhWQaUSbOgbj4Kv8IyDXMxIyA6wgfFgQD+Z03RFhQmi2uoLHVwwDKmJvyrxHp7dU1rR0f8t55Nonq5mDRq/117saiuh77tbbbtsy1GXMl5oI7mClAZlOik6f9p+l9xQPLhv/w/xnATNjMMmpBqpWADIAaL3J8FgMkLq+l/l//QftBU53iAcoUB0x/JDuKLTr69o1+VN0RUD6wwKdQ48+gXVXHkaZ0IAsau+VAmA8UXJjJVZ3N3X/BN4T6LtHVCXiyBjFvgOb91Rf9XnZyLhz3yrgMpzCchJDe0+QqsnRvZcg8QZvpCB0Mc1shY72PGgcs0HCHzVenW/GxOhpZJQGLlUBGR0vsNNRf5dbWOnpIB0XyiJ0+StPFQC35GJFuavnc/OfzbU5nxVfZrQana/qwxwiR6TYdX7vfWstdYJdc= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(396003)(376002)(346002)(366004)(136003)(451199015)(186003)(5660300002)(83380400001)(2906002)(66574015)(86362001)(38070700005)(71200400001)(7696005)(38100700002)(122000001)(9686003)(76116006)(33656002)(82960400001)(52536014)(316002)(41300700001)(66446008)(66556008)(8676002)(8936002)(66476007)(478600001)(66946007)(64756008)(26005)(6506007)(6916009)(55016003)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?yh0j4lyxDB4M5BF5256vrEJ?= =?iso-8859-1?q?HqlG4dwSS1MVnWJDjM5iPXENZSMfZVKRC431Tz1b4+fo6ajFdKrLi/yLC5jW?= =?iso-8859-1?q?qvh5z3DQ4Ol7SGa8QZHElR4Ru6PlOURQ/g9dI6tSitEJGAvwWlBK6+u4e1jJ?= =?iso-8859-1?q?SeCHElg4/bf77l/U311T/YLH23mwscXgYnGu0M68sP9Ripg98qp7B1gE8quc?= =?iso-8859-1?q?oUbWjVgOT6sQXPBrgnh4aWXnB0L2Kx8HMU7OhXsX66miA7aQnFYog9k4mcm4?= =?iso-8859-1?q?QeeVEer8cBg8g6w4aRPGlNgkM/r+MHyRn9/oiQmQ8mbdQw8zsXRQzd7v4Gso?= =?iso-8859-1?q?rr+gpEITszw16RW8YeU4eNo8C4GF6kePXzTi5XKCTuo9EhX0YtAnKrKcGHVD?= =?iso-8859-1?q?wkCbrs/4sw71vyYUmfDcBQPpsmx/Dr635LPMYru/lXy4mjHsiW+6U205AACj?= =?iso-8859-1?q?qFZUY1NMyy/5WASYF++jOUHhV5mKdvLwfHm26+CUmXSeNdrG6qdoQX/dvjBo?= =?iso-8859-1?q?wvCpbTAYLHYcBhgbOcG1R6Kwi4pNvpqR1E9MphexrSYMZdc5vs2HJbMsbmHs?= =?iso-8859-1?q?9i6w0KVo4dwGypgSs+u9U3hWdJA0l5rooFedInx+CCXcXZPo2i0fmKpFUWKd?= =?iso-8859-1?q?QKPBjQKX3kJ9wgrRjgy3Xk0nsLfi+sKNJNx8z3NU52OVAj/agn3dqHuA3U6H?= =?iso-8859-1?q?k06SUp5bfGMsXALWAv1TtnDn5hhD6fkpfjUteaZxuhW8Sd0OYwYCZ5j3Zmgd?= =?iso-8859-1?q?IUr1HGS+Cevv7J66zZbx1Z7dfAaQKr9yCYCAnVluldST7uJk4x9NrFBBtx4H?= =?iso-8859-1?q?IUAPNBJ40yIzl2yW29QN6mvU6mlBWKohI4boy/s0gXr2mO5/o5s/L3xspQ62?= =?iso-8859-1?q?cWvrGy2s0Pniq2GVoD6OyfLWD9dq2CtnVANeWRnlye38Rk6sVkF5gCYqqfxr?= =?iso-8859-1?q?Ilae0SOVp2SM4eifH+JKOVhx0N3e//q8JccT/b0nWF1gjyZm/qFDouDu1rN3?= =?iso-8859-1?q?6w1AMVA+ImkdZvyLlkR+qd+/9KAldBW/cP/oqKDbRApJ0rlUInZ/BKfh57hK?= =?iso-8859-1?q?cRzpDIp4jGRrlKfEd14ZRWNj9jRBDkWpd5vl81d9ijxfNNuZi4YUYgaFzEdL?= =?iso-8859-1?q?72YB3jTUOBeh/T74iQOrYuplHvGT9jT0HJgNUSMkA8yGfw4r9HppuMBl/s+V?= =?iso-8859-1?q?FCZf269CITBC7DndCGzWu5YF2qveGez/BHHCl4RvcFtrlwHVxpZKcumUuTYQ?= =?iso-8859-1?q?fB1kG6MaVTxtNdMP+PEXRJHhWIA5U184UA8K/ml56rWNo4fKGOZfDnBUqmRj?= =?iso-8859-1?q?kS3he449bLLRrrrYhRl8+RKMK8X8Gd9dLHwRhoNcrRqbvpO1xWjbSu8E9dAa?= =?iso-8859-1?q?84P8c92RTLXTpy5Xmvw2+8Ix175HIHhGcjg0JV9nPn/NTKxIdjB0ilCZjr7b?= =?iso-8859-1?q?0kxpzyw+DhEKtJPFjkto6izVLS9of+lIl7xKY1XMo0rst8qlxuxpfo1s8MgT?= =?iso-8859-1?q?7b13Z2kzNkn6wUsbMi2rS+DZpPjLOF57/epYJyV//p9SUbqKnRM/QHEAQ6Fv?= =?iso-8859-1?q?Hco7mDgzmnHz2HEmEjnPY2cDZyWukU7Ckg37ksmUl3WLVkcVxqCK5yIeh06G?= =?iso-8859-1?q?2JWhYAndRH9EKmFCDt85fXxt1whjx9f2Tre6BwQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: mail.schwarz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: ee53d3a9-03c7-4255-b240-08dabd80377f X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Nov 2022 09:46:01.0300 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d04f4717-5a6e-4b98-b3f9-6918e0385f4c X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ONrsf+WQtRkgYxlla5q+q8NHSGw6FDxqUxebnCKylTUu4v1ZO7YCXDd0UyKXVF62MIcrgmUZ8KtlIOBTiha3NRtm/UPt2Q5oJohdmbTwkKU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB5609 Subject: [ovs-dev] [PATCH ovn v2 4/4] pinctrl: Send RARPs for external ipv6 interfaces 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: =?iso-8859-1?q?Felix_H=FCttner?= via dev From: Felix Huettner Reply-To: =?iso-8859-1?q?Felix_H=FCttner?= Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" previously garps/rarps were only sent for NAT IPs if these had an ipv4 address attached. For lsp's on gateway routers that do not have an ipv4 address assigned (e.g. if they are ipv6 only) no rarps where send out. This causes traffic outages when changing the priority of a gateway chassis as the physical switches to not get the information where the mac address now resides. To fix this, we send out rarps with just the mac address of the interface and no ip address. This change has been tested in an environment with 600 logical routers on a single ipv6 external network. Acked-by: Numan Siddique Signed-off-by: Felix Huettner --- controller/pinctrl.c | 23 +++++++++++++ tests/ovn.at | 80 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 99 insertions(+), 4 deletions(-) -- 2.38.1 Diese E Mail enthält möglicherweise vertrauliche Inhalte und ist nur für die Verwertung durch den vorgesehenen Empfänger bestimmt. Sollten Sie nicht der vorgesehene Empfänger sein, setzen Sie den Absender bitte unverzüglich in Kenntnis und löschen diese E Mail. Hinweise zum Datenschutz finden Sie hier. diff --git a/controller/pinctrl.c b/controller/pinctrl.c index 8859cb080..767fa02d8 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -4512,6 +4512,24 @@ send_garp_rarp_update(struct ovsdb_idl_txn *ovnsb_idl_txn, } free(name); } + /* + * Send RARPs even if we do not have a ipv4 address as it e.g. + * happens on ipv6 only ports. + */ + if (laddrs->n_ipv4_addrs == 0) { + char *name = xasprintf("%s-noip", + binding_rec->logical_port); + garp_rarp = shash_find_data(&send_garp_rarp_data, name); + if (garp_rarp) { + garp_rarp->dp_key = binding_rec->datapath->tunnel_key; + garp_rarp->port_key = binding_rec->tunnel_key; + } else { + add_garp_rarp(name, laddrs->ea, + 0, binding_rec->datapath->tunnel_key, + binding_rec->tunnel_key); + } + free(name); + } destroy_lport_addresses(laddrs); free(laddrs); } @@ -5824,6 +5842,11 @@ consider_nat_address(struct ovsdb_idl_index *sbrec_port_binding_by_name, sset_add(nat_address_keys, name); free(name); } + if (laddrs->n_ipv4_addrs == 0) { + char *name = xasprintf("%s-noip", pb->logical_port); + sset_add(nat_address_keys, name); + free(name); + } shash_add(nat_addresses, pb->logical_port, laddrs); } diff --git a/tests/ovn.at b/tests/ovn.at index 3d54c9153..6b08ef124 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -9017,6 +9017,76 @@ OVN_CLEANUP([hv1]) AT_CLEANUP ]) +OVN_FOR_EACH_NORTHD([ +AT_SETUP([send reverse arp for router without ipv4 address]) +ovn_start +# Create logical switch +ovn-nbctl ls-add ls0 +# Create gateway router +ovn-nbctl create Logical_Router name=lr0 options:chassis=hv1 +# Add router port to gateway router +ovn-nbctl lrp-add lr0 lrp0 f0:00:00:00:00:01 fd12:3456:789a:1::1/64 +ovn-nbctl lsp-add ls0 lrp0-rp -- set Logical_Switch_Port lrp0-rp \ + type=router options:router-port=lrp0 addresses='"f0:00:00:00:00:01"' +# Add nat-address option +ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses="router" + +net_add n1 +sim_add hv1 +as hv1 +ovs-vsctl \ + -- add-br br-phys \ + -- add-br br-eth0 + +ovn_attach n1 br-phys fd12:3456:789a:1::1 64 6 + +AT_CHECK([ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=physnet1:br-eth0]) +AT_CHECK([ovs-vsctl add-port br-eth0 snoopvif -- set Interface snoopvif options:tx_pcap=hv1/snoopvif-tx.pcap options:rxq_pcap=hv1/snoopvif-rx.pcap]) + +# Create a localnet port. +AT_CHECK([ovn-nbctl lsp-add ls0 ln_port]) +AT_CHECK([ovn-nbctl lsp-set-addresses ln_port unknown]) +AT_CHECK([ovn-nbctl lsp-set-type ln_port localnet]) +AT_CHECK([ovn-nbctl lsp-set-options ln_port network_name=physnet1]) + +# Wait until the patch ports are created to connect br-int to br-eth0 +OVS_WAIT_UNTIL([test 1 = `ovs-vsctl show | \ +grep "Port patch-br-int-to-ln_port" | wc -l`]) + +ovn-sbctl list port_binding lrp0-rp +echo "*****" +ovn-nbctl list logical_switch_port lrp0-rp +ovn-nbctl list logical_router_port lrp0 +ovn-nbctl show +# Wait for packet to be received. +OVS_WAIT_UNTIL([test `wc -c < "hv1/snoopvif-tx.pcap"` -ge 50]) +$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap | sort | uniq > packets +expected="fffffffffffff0000000000180350001080006040003f0000000000100000000f0000000000100000000" +echo $expected > expout +AT_CHECK([sort packets], [0], [expout]) + +# Temporarily remove nat-addresses option to avoid race conditions +# due to GARP backoff +ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses="" + +as hv1 reset_pcap_file snoopvif hv1/snoopvif + +# Re-add nat-addresses option +ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses="router" exclude-lb-vips-from-garp="true" + +# Wait for packets to be received. +OVS_WAIT_UNTIL([test `wc -c < "hv1/snoopvif-tx.pcap"` -ge 50]) + +$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap > packets +expected="fffffffffffff0000000000180350001080006040003f0000000000100000000f0000000000100000000" +echo $expected > expout +AT_CHECK([sort packets], [0], [expout]) + +OVN_CLEANUP([hv1]) + +AT_CLEANUP +]) + OVN_FOR_EACH_NORTHD([ AT_SETUP([delete mac bindings]) ovn_start @@ -13867,10 +13937,11 @@ $mcast_node_ip $nd_target $nd_src_ip OVS_WAIT_WHILE([test 24 = $(wc -c hv1/br-phys_n1-tx.pcap | cut -d " " -f1)]) OVS_WAIT_WHILE([test 24 = $(wc -c hv1/br-phys-tx.pcap | cut -d " " -f1)]) +# Use the grep here to filter out rarp packets that might have arrived $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/br-phys_n1-tx.pcap | \ -trim_zeros > 1.packets +grep -v ffffffffffff | trim_zeros > 1.packets $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/br-phys-tx.pcap | \ -trim_zeros > 2.packets +grep -v ffffffffffff | trim_zeros > 2.packets cat ipv6_ns.expected | cut -c -112 > expout AT_CHECK([cat 1.packets | cut -c -112], [0], [expout]) @@ -13907,10 +13978,11 @@ $mcast_node_ip $nd_target $nd_src_ip OVS_WAIT_WHILE([test 24 = $(wc -c hv1/br-phys_n1-tx.pcap | cut -d " " -f1)]) OVS_WAIT_WHILE([test 24 = $(wc -c hv1/br-phys-tx.pcap | cut -d " " -f1)]) +# Use the grep here to filter out rarp packets that might have arrived $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/br-phys_n1-tx.pcap | \ -trim_zeros > 1.packets +grep -v ffffffffffff | trim_zeros > 1.packets $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/br-phys-tx.pcap | \ -trim_zeros > 2.packets +grep -v ffffffffffff | trim_zeros > 2.packets cat ipv6_ns.expected | cut -c -112 > expout AT_CHECK([cat 1.packets | cut -c -112], [0], [expout])