From patchwork Mon Oct 24 10:47:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1693818 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=Fkua8le/; 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 4MwsGL5vk0z23kR for ; Mon, 24 Oct 2022 21:47:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 00E8F4057A; Mon, 24 Oct 2022 10:47:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 00E8F4057A 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=Fkua8le/ 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 lU63lHX4BXvV; Mon, 24 Oct 2022 10:47:20 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 04E3D4055F; Mon, 24 Oct 2022 10:47:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 04E3D4055F Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D2BF9C0033; Mon, 24 Oct 2022 10:47:18 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 14069C002D for ; Mon, 24 Oct 2022 10:47:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E12784056A for ; Mon, 24 Oct 2022 10:47:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E12784056A 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 Hu9qPTts46Jd for ; Mon, 24 Oct 2022 10:47:15 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 975614055A Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2127.outbound.protection.outlook.com [40.107.21.127]) by smtp2.osuosl.org (Postfix) with ESMTPS id 975614055A for ; Mon, 24 Oct 2022 10:47:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aswNWITq+l02OGo1qVO66v5KilksyjtDS718CS/OtWBrjU2X/PwtG+I2isFTGnmvBiQpzZjoOpaYVfcvNauSbeTSzlP/E4tpanUs29mK/yF9QY+HdSnNpbAUCTW09DREIBsq4RGTQLc4y7RSOaGt4LBNF/hjTSpfbACJAC0/A7prDG4rLDjLXIovQ3jzp1roVjKRaH7EEbCdVzji85J84B/leXC5/JfagNy1uGRjWXpb9Xx71x+gzK2Hi8mHS6EFUaYAMJDWR5YGASZdRqFSq5/1+NQHQKGh4ul3i5qt85xZsWiO3AEgpK0ebjm8sRhZC0kgwFg8UhxVjcPH7LIghA== 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=R/JHvzaItpVCvfgBEjDghjbD3xp8lvAZczKL1i/yl+0=; b=DDMuVBl6SDqbYON58sjKSfdOkW/6OTw5Qtvjrkkd3Xl1xO2hMvsdpxRs4IqPPjCVoUiiQheav0fIZm+gQuQgZof7JmTdEugAcjapmfODasTv7pibTLIO5xF23ntqg9MqKj3daRF4/i3vu1fwkrW2RL08oDdsnByaw9Ej3Jb2WkTTuvf816dl0W68pg4uuFZJDHVbstVZ+ijx8pOsMnMGxxt50KcMmWa9jebmqT+TKh5npd58GVHnZRDx4En6I68oMPLxk5pToxVbGibtGYo74ay4GDTxL1gtZ8mmV2ww26ha1YVX6mFsSwxcj9ha9qREoSJxunPOMUrTJFAHDOG/jw== 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=R/JHvzaItpVCvfgBEjDghjbD3xp8lvAZczKL1i/yl+0=; b=Fkua8le/io4UwZ1mRr9iHPWJBuosHrNhB8sM2WlkI19pFWipvh6QV3kEU67Vnia5jXYQDgE6swwS2lbx7NoCvprXjrDRHy7iZHK2uZ13YPngSiyN99nyiOdV+sXSKVI7E1iTAOdbm5xY7Fkq9nyll0YD6QsoNpQpyl60TFYcHoqlirfYrnC2VgFz6UHdSbJWza31RqtI3euOzX/wH+UuwGZsLYdZoUfv6Jtqe5NnTPG1g4KMadi7MhsLAjdNmgGDOllqGHwJzLAG7RGWXxtnwfZPCWR72CTmlnrfZy67kgE4z3H08UtLodwQEjolFG57i8AEobq32sO1cN8aRAI+CQ== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AS8PR10MB7375.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:615::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Mon, 24 Oct 2022 10:47:12 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d%5]) with mapi id 15.20.5746.023; Mon, 24 Oct 2022 10:47:12 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn 1/4] logical-fields: add rarp fields Thread-Index: AdjnlffSweKsNbepS/m6IFBfg5axhg== Date: Mon, 24 Oct 2022 10:47:12 +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_|AS8PR10MB7375:EE_ x-ms-office365-filtering-correlation-id: a8edafad-599b-4301-2b98-08dab5ad1b84 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: 4nFXtOJ5qW+5TaKuVxMGJ2vKqJh+9hYGx1V1rDKTmA5Uifi1H05zrdqiJdVN3L8z17lB2NohZ7EiARVP6AwOVkOIdNf7a4f9Tujo5+rtEmlzS5jKgmRuyZ4nIfQeCtKue7uNHxSl6AKrglRgPQKJF/JrkNoGzcSRCAw9nT4k1Ic8WlGvsXZqeaqdCILgl6gOueJFK/fGePTCX3qLc2BuP8htwLjxyNsf79lzTIDfJJHrCGKU51q5T+xUQG0KLz6zkZaxsNrkNJnxq4Au5nTCMpbaCN7naaqtSvILZCdQp7agv96XRRYrO+hdziiCpktuRsWHVx4HF2A3ZwZDeG84qs2KCdxNpABj5Om/yJmkLp/8n1rvzW+QH7qgi0KD2WKelUiCs3Mp3dkrISUt2Z0mKIxsEltZbx2doNgcy0Ri5qLI+STPkejiyTQaXsov+mK8S8jh3Vjhymz5XdQzdRKpp84EbTQtXcUrSlGM1RTXboTgkllEZY6wdKO9ZxNLGJYPDX0fNfD8/p6c9e8eVipXv+Jdm78dpwiR57xsBX8W5s0URxKPUnUc21s65iJI61Blh9yC2r2L9I3x+Oz4ew3MOKKW6uAAwh2pe9jJO3KcBivuBFLd+iGi/v2MgyNr4gGO8iI2IsnGLTOnmNUJfRJvkSo6IT2hSBesO/S9Ta1VEjld0PqgOTopkR1GNeoUexPy+oXhcd+fBOiLeamCCDBauSBJQ6maBbzxqcxokrtTo6g2fCnBKLfhpIly4AM3l5YZE1BVFewEufCTt1bBuOtS7Y0ZTFMbtSNHEgfmsN1inWc= 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)(136003)(376002)(39860400002)(396003)(366004)(346002)(451199015)(8676002)(33656002)(82960400001)(71200400001)(66574015)(83380400001)(76116006)(478600001)(52536014)(2906002)(9686003)(316002)(38070700005)(8936002)(41300700001)(122000001)(86362001)(38100700002)(6916009)(55016003)(186003)(5660300002)(7696005)(6506007)(64756008)(66556008)(66446008)(66946007)(66476007)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?2ntCvMHXxB48LJAGJ4dzJ+r?= =?iso-8859-1?q?7I9c6gEve//Y08N12K3ZAB/xRgYNERE6p05ERd6eelxbIIT58FSXxIv6Z5qZ?= =?iso-8859-1?q?UK8mkbVqN+Gq4c0LlNQzVTU+ExT0wgMSI2TXcowcW+D44pI21y+LRkjDQyrr?= =?iso-8859-1?q?U9vz4w8xH7w4UtTdLHY0xZVBaxvpjpnYBb65cP1+t5IZkX/bHQzaQp/8rg27?= =?iso-8859-1?q?ByGdD5yD6KZErxSYnvB1in5GAR9QKiBYGGwV4vjP6mBdT1tePMohylJSIOTr?= =?iso-8859-1?q?jaQ+QIz+fBNsjmTpt0DlOnr8pBMHcYKbE/4yUf71LtV5sMo/ACHN39xPuwhb?= =?iso-8859-1?q?6T1wauWwoNPjfe0Iw8AbmuMAbKQqT6QEPizdJW1Z0gwX34D8LFiUsC0kbGEb?= =?iso-8859-1?q?keLlY0ua6kUmnU3c0uRgYkMhp5oOuUrsQrrNBQk2VFkV1wOo2b0cc6GtHx2o?= =?iso-8859-1?q?oLHwatoyW3DEF1kmyo+Xn7KWgqfbtvzhejoa86RK8dSr4k6VcHlZOOpm9RkK?= =?iso-8859-1?q?+rbJlqa2OuftLkdRFT+yOQUYIuoc08Awj7qx39pUuu+MZjJ29g+NCMYDF5aC?= =?iso-8859-1?q?h2EpP06pYvghsvdEn/j/CmmAY94MPkNOV1G2Xvw30nidpUcSwLTz0fmctaFI?= =?iso-8859-1?q?bCxJL6bk68Lrau5MaRQvNYXtxIORs4iGg4HLdw64w6zPbO3gFuNHaKwc/IX2?= =?iso-8859-1?q?YoT6f0dqTuMjIBUsSbfHvRqCaxF7QdOkDhn2NSQrp1PyHjL2mUfgTEmB0BO0?= =?iso-8859-1?q?2S5VpKT8O3tOdzPMx5n57snogJL5QX5MG42N3g3f2usm3GhPzny2DtyGJrk5?= =?iso-8859-1?q?CNFEKJKzkPQUNK0j3ERlpB5Lyrc/C2JqqIRtuixX8HFqvTbbQ/0Erv7f2vpF?= =?iso-8859-1?q?5Lz2QZqK8m2LlDgdjkc0LuQafUDuiaRksLPNp25cmx72Z601pj+5yDfBSvBj?= =?iso-8859-1?q?FYV8jna4eJqkQo6T8JANgMPoYBawum8dS+UY2FGdbd1Wjrfa7YACG0dJ4Vf+?= =?iso-8859-1?q?8jERulX7RgPpr8xRIZyicO8EbhsICVXnmG8A/SCbs7FB4KvSBF9MEIQg/i3G?= =?iso-8859-1?q?/8lKlHRzj3LjUoUQ+4AxRe+ltuqnVUkt4Gbi5lbu0v+RsQUYq0WYr/svDRPN?= =?iso-8859-1?q?/6UrLome+uNPqi/yx7ufdt7eKEtczmyLp8UCjxpFjh4vQ38dNhXlYvBylAqc?= =?iso-8859-1?q?l8Ix6RhrGt14Ajr0yscsqm/7lhCJypsMP+k99/3ve/1D9FCs+BOSuGLhvkgp?= =?iso-8859-1?q?hoWudfsDLoUKw7cSJeNvVufn/3U+BrwpLGiHcqCrGjIXod+MTKQ7+nqtR5r2?= =?iso-8859-1?q?B8+ZZOy5MiaIDTuYNwPGDgiUEjwPcyeLJOPsiGbAAGmob3D0A56IA21/x7r1?= =?iso-8859-1?q?nkZUca0V8bRiWQgjUPuRJiha5CRFVXdcB3fDWqlV6JV334daisnT9giWWGkn?= =?iso-8859-1?q?i9svy23DzIXvYKRzM+4ateScHk28og2dR2yYTWPW/MUiTIJg7HYgnbOfgTor?= =?iso-8859-1?q?YPueW59rMvGynaj8p9sRt7j/hGAAIIEzCyFA9gWTEdvsnJNISM45LAvquChD?= =?iso-8859-1?q?qR0Kjl7RXGReE+KOX0yIVpoJePJEfxQ3CpO0nDZ/GTjHNvyMxt8JOq29Hw9m?= =?iso-8859-1?q?zl+k/0BqaXdXLBwMJ9tB9RSpCwr6UUrqmh4Biy15OfUl1f9VHXz+7lbwtkuE?= =?iso-8859-1?q?=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: a8edafad-599b-4301-2b98-08dab5ad1b84 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2022 10:47:12.1806 (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: eBsFNRh0CJkQacxYV1i403lAPAyz65mnjPb10NExdOgMp8aSux+qVAXsq4r0KuFTcLYaX4ZoMNQPJz8KwMR/XKRGeiXWWNeM1W1dQLMaueE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7375 Subject: [ovs-dev] [PATCH ovn 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. Signed-off-by: Felix Huettner Acked-by: Numan Siddique --- lib/logical-fields.c | 8 ++++++++ lib/ovn-util.c | 2 +- ovn-sb.xml | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) -- 2.38.0 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 Mon Oct 24 10:47:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1693819 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::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=YWfLErk2; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::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 4MwsGW4PYNz23kR for ; Mon, 24 Oct 2022 21:47:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id EAFC240894; Mon, 24 Oct 2022 10:47:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org EAFC240894 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=YWfLErk2 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 7JQfnTZP9PJB; Mon, 24 Oct 2022 10:47:26 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 5783540889; Mon, 24 Oct 2022 10:47:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5783540889 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 27623C007C; Mon, 24 Oct 2022 10:47:25 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 05F7DC002D for ; Mon, 24 Oct 2022 10:47:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E7FA460BE4 for ; Mon, 24 Oct 2022 10:47:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E7FA460BE4 Authentication-Results: smtp3.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=YWfLErk2 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 4BIypnuR60A6 for ; Mon, 24 Oct 2022 10:47:20 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1006260BA8 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2107.outbound.protection.outlook.com [40.107.21.107]) by smtp3.osuosl.org (Postfix) with ESMTPS id 1006260BA8 for ; Mon, 24 Oct 2022 10:47:19 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m4lGTX4JqvF1D7q1/zeBW7a+uc4PpOZhVc1+bnTAdMZ4fpyLAoh2vjNdyIrcdGUrG14gz+yUwWOxa42T2iTFtPwJLhHHe2exX01fhfmzayfKVHwc835sebkZ//aYqc/7k5DeRhJNl7iQFhVtwjgYCbOb6NMpnNs/01DRa6E0mkPWEcI4UkvaOT36hgSj0AiThGzmlGTWOvg5QwegCZoK5cTLcH3DsVZ9iYEMWOYk0sBs6+4pmyvmvCfIJkPu82Rs9b7rMNOUXaCft3y37OBJRjPFL8Rn0Hgvx39Y08tU+GRQp5R7xi0qwIU1FRt2q/3lD4H460cRfFrBZsi0V2ep+Q== 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=Z/7rK7X7wv5wX0dxGatHdi5vzYi9N+7egOSDngJCfw4=; b=LiA1WEjqOO5GF1b9dvHYvvYxqH1CjWV34fQJSM+w2MVPLnL0Dr7pbU7MjZnsoBcaCWPQHA17LxBeoD5O9KKxsuYa6o3br2rUDOyXL0t/56cXwt6k9lZb/+kVoHY9CkHzXQwoYXDuCCYdUPkvgKoavsMu9a8rE60a+kEVj4u2fK1YmXjNODxGa0Eb7cu3NS2PnEmkr+GTiF7mOtGabbfLoPoUdBlMLp/Q1HJfxlEaVqmRasqjErawUlqJ5oXs6QFRves1gS9DlkaAGGye9i8rim77cCZ1poYw1mMI8Rula0jIHkn5fiDmSTHXeUFTYDk9mrHZb4LHzvfQ2n3DEb8i9w== 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=Z/7rK7X7wv5wX0dxGatHdi5vzYi9N+7egOSDngJCfw4=; b=YWfLErk29mLbYD1Pxcb7Q8FDduZDUukhsfNwIElXOh6mFPlLP5bfFchAxSxb1QjczHVtw/z/Sk95KLcc932uQvBfhNhj0USOYCJSZbKL6oyaTl0BPvODgaPFdrHZ+jTR7tntSjhA2f+GH+O3CUiFflJkjMLh0I6RV1PXwkxj8plz/qjGumYIcigZbV67QeO9dNZWJSBbfW3hJBZ5kAimE2V7mEmmVwX9MjnTRSB+pD7HOA/lAErNT8OwB7Det+PSMNjLNe6g4kTVtwLWhBecnpc3o+mGO68UQh2faVALt5kvb3Fay5wPiY3tyHNN82mZlOTEt7op9kya+OR9d8iUuw== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AS8PR10MB7375.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:615::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Mon, 24 Oct 2022 10:47:17 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d%5]) with mapi id 15.20.5746.023; Mon, 24 Oct 2022 10:47:17 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn 2/4] northd: handle own rarps like garps Thread-Index: AdjnlaifWrQ1o+IFSny4diaWYRbGKQ== Date: Mon, 24 Oct 2022 10:47:17 +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_|AS8PR10MB7375:EE_ x-ms-office365-filtering-correlation-id: ac573362-eed2-4690-5ca4-08dab5ad1e86 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: OVBM9usXA0TfjXIEK9ZHa/vyvpFP9yixioF7qDiuvBjytNNBi4Zmxs7/VubbAqJBK1dqXAav2eN7Wu66WQ8/pfJ9vxMlPoADHTjaqSFUqCgamawFB4fywDEDxhkhUwkhgJFFF+VH0yHO50QkCSeqyGRS6IbKTW4fnoPvnoS/+aePIIJoxcxR2/VDTI8FTOpZE+N/c82zWsLibxwx0VWlw7k0zXdhtfwaMm31wZVcq+4PkV3QVqbMWXM7rZTHAnKAYd387/56ZuBvhCJ9M0kmXle0XUhPwXgZic5oGNUKZIlqM0+TlJur6hThPhNTT3Cnq1mi2XOTWRftpbeXK/o6/Oh0Fl8R2oWb4iSdop6COI+OmAUwbgB/OxZyq5R7ISjVPMkTBTztQ2Vu6PQPgs0PvCbDbYhajKir0bmqmTgXPO728pu7nMDFOwSEZnnLJcZwEHAx/4gl4d8+zvxBbYvbchPGX9cXhw+fEG4fjwi5ZrowIQEAHpbDGThQzRYldvxgxEKvzsBdYcdvLRZRvQU9SQ8BMBlKgYzsuJe6sqN0WLE9EbV7Sn8A8I7NIHXCbd9Aw6zkWWwkMGllZKBkF5D1DqiDn3Pv3HesS3yP51yPGXL3MHpFsnoJIJihJZI8WRgAll0cqkDPfhfMHl0cYAtnSKLnW+ZdQts7zaeaMFAsNdokrmmcXqGe49baClvVO6nhso48n4xOlYZ0kGih5B6mc7ZWmvc6E7IMM3CWuKM3+vzqGAQkYdCRM7Fm8ul8EjhmkZg0rhgyVVRz4dNV2uPatoWbqwM4nWaF+ea8OzfoOTI= 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)(136003)(376002)(39860400002)(396003)(366004)(346002)(451199015)(8676002)(33656002)(82960400001)(71200400001)(30864003)(66574015)(83380400001)(76116006)(478600001)(52536014)(2906002)(9686003)(316002)(38070700005)(8936002)(41300700001)(122000001)(86362001)(38100700002)(6916009)(55016003)(186003)(5660300002)(7696005)(6506007)(64756008)(66556008)(66446008)(66946007)(66476007)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?loltCl/eD5fHUJ8dYILid1w?= =?iso-8859-1?q?Jj6bkxiDfRe2Lx3+XpikMGkZa7kZY53q6h5lQbAt6WMzPEnVroqmXsHWyrIy?= =?iso-8859-1?q?ivT6Ew4WOmTRhmBCJRgq7c9qt15okgP1PQaKDn/KjoiWVqzuyl5VhNQAgD1c?= =?iso-8859-1?q?TKHoQEJLquEB5R+nX6lFR9i66Q4jpfOjoGI5pqf//sMheQy/sSG6K0LhBcew?= =?iso-8859-1?q?R1UEBuAfvKCgrJJvq4xXgJKopEHoZUyt8VvPLVU+x4vMSA4YXE+fcxSsrrTn?= =?iso-8859-1?q?f506V1TBLtJyLgRFz7W7TQfYYqhE2axV7mioltbDxq+CgtrF96/VL8/2/Man?= =?iso-8859-1?q?usBE/XVd0AUpf2YRoJ8BIBi8j+LNlkqwLSYwJc6VTzkzexvHxOTRPYusGUWL?= =?iso-8859-1?q?bZJXRIOtVRZL2c02XPe2k/5AFkcYWYu4Y03G8ayo1k6Wu0qg1PnHOIq9Cpkp?= =?iso-8859-1?q?fj/c07fjW/JLPjyyEWLhbPeuqkaTJwiL6zVXg2hkjk+oWlzb9iELUDQFbQI7?= =?iso-8859-1?q?vjw+FTP4fCiy5gVOtJxhPwv3vc2FjmZG/qtiXPIWOArrBnUDaCSaw7I1umzW?= =?iso-8859-1?q?saRjcUAceBc/Zz2WCFkVvi/p1wPDE+fvnKa985xm0T5eR7/NAR/THb1sDBqW?= =?iso-8859-1?q?WWGUMr2AYiIpJQo0JvYj1iY3DmMOamJkqLBHyIEgoD1B+aFwRl31CEhCMUxT?= =?iso-8859-1?q?pGQ03OA+PMdXWZBea18p0vUD4+r/KzhEKBhl/oc805TYrAfQ6ykvoPLP3J8m?= =?iso-8859-1?q?8DvAWhTtLzA5FdSURoADIPJc1TwCW9GW57ugK7biNtywKr88JITE1ZfQZiSQ?= =?iso-8859-1?q?Os1EI97oNWcsZMI8bqgXJ9cMWxecgEP/YnF72GesXVsKFwE8VLBm/c9YDe8S?= =?iso-8859-1?q?s72jjEZ5N82wbZ/NpPNPge+VDgtMj0/wnLB7qd8Cd1KTgDHQZuzcEH53WuTE?= =?iso-8859-1?q?vbEPhyb6rbopnZo58E7UviDEN2QEVr1yOuA1aeYFpTr0rid76y+xLHh2MfkU?= =?iso-8859-1?q?MPKfuYJOkmd7QKoKpNMvArnRixd5fpjCuea3AsK204N/oPEaS0TcSLEH4Jng?= =?iso-8859-1?q?IKOSEZvcUiF5vS6iv+bf+G6Jl2BtfuD1jBwtSPkrA0TUZQfTTRUk8GFF4MU+?= =?iso-8859-1?q?m48cc9PfpeaZhxseql0aX5KpRQF3zbNPKpEMs2u3I5ALxM9rRBanZXwHkT8l?= =?iso-8859-1?q?ICmhizqsF5+yrYC7OwrNlGWR9wyWvPsy+iDrJ5VK24/duJHszGsicEd6v2tp?= =?iso-8859-1?q?ThnAqdiW7Yy7uIxodEb4GwxKH6twmRZRBV5psONcaGGyzBPQn0uYpa2MLiwE?= =?iso-8859-1?q?tR7YTc1XueC6zUTpa12QUtiE/hOMmrFoC6ZUwy5guuu1VXnP5Gm1tT4msHov?= =?iso-8859-1?q?H0ovNIIhmHSF9ZSCGOGpL1MDx6IXIgAd2UlCKEWkJF+2cU1wkcVB2TrR1Imv?= =?iso-8859-1?q?rk+0pzqs1uC3xkROJwx7ctXDsP7CaJOunOl9Vd5fYlp2Xu300Z74Lkp259dK?= =?iso-8859-1?q?gUJtGdkH6a0pPYjgNVGJNdm0q6TSAebs2IDLEBiBOynATTvN2eAh32BrTZOo?= =?iso-8859-1?q?pVgK6KtuL34LVlMHz5tBRkT/UtwNgaUjDzX7sb37aKHY00TbvNarvRVnRCqJ?= =?iso-8859-1?q?r7R9/c+0UKEZoW7ro23R7WwXMPNlkfdngLYDDSp5uQZaKjHQYakfIqtiMw80?= =?iso-8859-1?q?=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: ac573362-eed2-4690-5ca4-08dab5ad1e86 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2022 10:47:17.2281 (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: MBLK/XoQYJ+QS/Llob1Ykq9MGUJ/IJHCaEhVC7kPpxR9tp864bTD5qmBJgyhGVLjlOBxXPHg7tQ3KYjO3UctgqVYQ4dxCS6i9KsTNs8wF+Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7375 Subject: [ovs-dev] [PATCH ovn 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. Signed-off-by: Felix Huettner Acked-by: Numan Siddique --- northd/northd.c | 9 +++++---- northd/ovn_northd.dl | 2 +- tests/ovn-northd.at | 18 +++++++++--------- tests/ovn.at | 8 +++++++- 4 files changed, 22 insertions(+), 15 deletions(-) -- 2.38.0 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 6771ccce5..63054a775 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -7345,7 +7345,7 @@ build_lrouter_groups(struct hmap *ports, struct ovs_list *lr_list) } /* - * Ingress table 24: Flows that flood self originated ARP/ND packets in the + * Ingress table 24: Flows that flood self originated ARP/RARP/ND packets in the * switching domain. */ static void @@ -7378,7 +7378,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. @@ -7394,7 +7394,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;"); @@ -7590,7 +7591,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.dl b/northd/ovn_northd.dl index 2fe73959c..bdaa23d04 100644 --- a/northd/ovn_northd.dl +++ b/northd/ovn_northd.dl @@ -4636,7 +4636,7 @@ Flow(.logical_datapath = sw._uuid, eth_src_set }, var eth_src = "{" ++ eth_src_set.to_vec().join(", ") ++ "}", - var __match = i"eth.src == ${eth_src} && (arp.op == 1 || nd_ns)", + var __match = i"eth.src == ${eth_src} && (arp.op == 1 || rarp.op == 3 || nd_ns)", var mc_flood_l2 = json_escape(mC_FLOOD_L2().0), var actions = i"outport = ${mc_flood_l2}; output;". diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 7d879b642..c6e269fba 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 Mon Oct 24 10:47:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1693820 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=W9wmVgqY; 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 4MwsGn3Mj5z23kR for ; Mon, 24 Oct 2022 21:47:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BEF6F60C14; Mon, 24 Oct 2022 10:47:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BEF6F60C14 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=W9wmVgqY 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 lPnacvM2HeZ3; Mon, 24 Oct 2022 10:47:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 7A57E60BF2; Mon, 24 Oct 2022 10:47:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7A57E60BF2 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3F396C007C; Mon, 24 Oct 2022 10:47:39 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 37062C0033 for ; Mon, 24 Oct 2022 10:47:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E101340591 for ; Mon, 24 Oct 2022 10:47:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E101340591 Authentication-Results: smtp2.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=W9wmVgqY 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 C0SHaX_n9GUq for ; Mon, 24 Oct 2022 10:47:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 94AB140594 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2139.outbound.protection.outlook.com [40.107.21.139]) by smtp2.osuosl.org (Postfix) with ESMTPS id 94AB140594 for ; Mon, 24 Oct 2022 10:47:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dsZF4It8ltkNMhfGYhuTlk5CGkA4xHp3zBKNB+ckFTSitLsY6b06t2WMR+AwED512bO4l3CZ+drIOpEhkKjVCf/sdV1A+BVUgNjndlvMn6+JQGvYJpk7naCKbn3PpqmsxF+Bq7Ip+LWvw4/6rI/db0QqGkJRpFxSTztHAEoOIINVSoHXOZoKQOfnw1zdCwvc7VujjtJA9YB4pTwV6qUYIZkOWOqs5h3JGZs4uc6d2s5Q7j4zAh3SaLmes3OKyu9wtGYWDd/oNOy/1aSrs7sg6+YWKriK1q6xN6E94cH7truuLwRov7AR6U/57LFOSGQzWtBuXushkS4rP1QSjlVreQ== 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=KAs2ha4bkT1mrqNgmL1FAmJx3R+lAig8/9TYP7Bi+P4=; b=KeLiwTw5aNQ8QNAJcwc/2jb6DSvgA81YPLTS2AwLFhgl5ayJcP2hm/bjXxG1CNOhsrWSeAhL2n/RRvArfJGxVOY10TecFu6sn920zxNveXPFUxqzRwSKDlToS0jF4pCYWdtCfOLOovMm/GqpsMT6HbBThLsZoCjQX7Bm0PLL709+sQ2V5OgR29mjkMpdzg8MXBn3sTXKl0gA9mjsQkKihpwXJzvfekiyAmAeXDxd2F5JXywFvnDhtDOU/sBFbP9mGw4ppRinLBTpKEXzXIHn67iKiI7Ueldaa6SO/53tqRj8LitpmosePZgAVMAsQBY8UTUllTuU5h1fXVHxzrumBw== 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=KAs2ha4bkT1mrqNgmL1FAmJx3R+lAig8/9TYP7Bi+P4=; b=W9wmVgqYoRXYKF22KaMFTQi5U2nC8uKH16KwWw8/zSLboNO4ZSKhkmNqUHNIClyu/s4Dd/ltioAkpHambp064QW/6yGvWH7crYooat2v/40Q+TH+2eznhUx+Siw+gue98WB2JSaQmGByaPJy5hjLKiEPNZCAF/ECOuFpAj2ViPzmaHyBBFkc0piQnefPOSIQjXCOfy/KB9fXiisd6y9XBKe7wnok7tAteQLtcxcZWE4tnHEIOPhJxYwhYrCLsOUyF6CouVDVtrqGyLgApEoPLOAVOh7mcskNqNE64cEZpwo5CtDxUJnaWVdKhpYJkm5+zdAVdZYOrdZG5xJBD8Fw/w== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AS8PR10MB7375.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:615::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Mon, 24 Oct 2022 10:47:22 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d%5]) with mapi id 15.20.5746.023; Mon, 24 Oct 2022 10:47:22 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn 3/4] ovn-macros: support ipv6 in ovn_attach Thread-Index: AdjnlYS1d3WgZvJ5R8CTmAONeWnvxA== Date: Mon, 24 Oct 2022 10:47:22 +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_|AS8PR10MB7375:EE_ x-ms-office365-filtering-correlation-id: 45937510-9b04-4e64-3dcf-08dab5ad217f 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: ASzDeWTMBRlzEeAurJSa7IB7Uh5TnNB8C2cMsIVpIlbmoKdeKwZVlQYkgXKiUQj7xDxD+jKXzVrwVl33vi6FXgvIIgO2+wnlNZ71W8OzaI9f9rUrjKFGinfKXGvZaG/ohuCnHhReAmGnB7TiU5i5fWWpCkb+P3hVN6agC2rBdMcp2sp4QMxCtD83fVnPbdFTBmJZs0xjW6dWpjXVicjF/rah7BAE4h0eH2zL9hMocU/V2QlFvOKnRWVilXzZYm+lrhDJjp3tdyzqC/jdTAaZGcoVnb2KfEAbXf8Hg2DVmeCxro/G/+dLnxFwkS5qzrxvWQtGZDDuT+eogbrKmeuUK2PgsguFaqD2ZpNjURA1ztbRVETVtuZxcImkqDVK0D2h8X0mX5If7YFtNkGTHgoqHARxNIr3AD61jGA79Qc8dA5sfwjw5IUkI2ytY8UE+s/3mpczBBdNgDzEopvhlL1CZa8z/3BynKLOsPFFIXKPVUDoU3BiGpw4//PgZZP2n3WvHasMjsO4yZUU1gG3SAQcZUHn8cnPr9c5U38f9befXtoVrIL5BpUVlj1brNg+P3bVnIxk49Rzf/7zcrMUoJSA6mC4oSwCJfXXyVgQFl/i4VRIqjWoivd16Pu2IkQSUGDxPVRQFiY6CR8OyDIeDKYe9Teryz54EsfV8Sfvll/5IM3ac+fYhNXlAqyyytCZ7XGZyQe0E7YMfst4Ovmw6a9HtC7op6OAzs9b4sUa+6JOE7lmfSSVTXyBQ/Qv+t7PnbgW+bfXXQWLOtvkGB1Tp1ltq/Rpyps8/rXm5/1EZhmkdcY= 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)(136003)(376002)(39860400002)(396003)(366004)(346002)(451199015)(8676002)(33656002)(82960400001)(71200400001)(66574015)(83380400001)(76116006)(478600001)(52536014)(2906002)(9686003)(316002)(38070700005)(8936002)(41300700001)(122000001)(86362001)(38100700002)(6916009)(55016003)(186003)(5660300002)(7696005)(6506007)(64756008)(66556008)(66446008)(66946007)(66476007)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?9r6P7K49yfwSYx+ZsV8hoFI?= =?iso-8859-1?q?RdLxz6IzqIOp1GkcHqs38d9SxmFEmT8uQsypFgLAKgRM5N98FX+ZkuKFfp04?= =?iso-8859-1?q?KDv5lGurC4adncQfSXOnvSaYj7UE6QbEWzsGLnypJyyGZZr7ycmFgtJozq3C?= =?iso-8859-1?q?1rYWAARdJgl8b0ZigGEkewOB4GxigjjeIWYANxFM2L0wyS5sDmJi/vVrBigz?= =?iso-8859-1?q?/2bK9OGnngbBB+rRnt1WqT8XrHIP89jz9mICUWPRYS6wMw//449bYo5ws891?= =?iso-8859-1?q?0vP1EVUV0WXXYZdGvqQBPFa15GI44G4+umP5AQOx9ZXgvV1VyHkFekJf2PER?= =?iso-8859-1?q?rPg6vjM7fypvAWiL0QTjZvJ7S1orkocW8skab0wMRoXHNll0z8Ps90BEP6kY?= =?iso-8859-1?q?y3iB+dpdYS4TuIsplG12JOii8LqTw65o2wdz5PZKzlqhmuJUwm4eRTJAtEvF?= =?iso-8859-1?q?cdm5UVMOu5V6E1kF5705POCum0ntHpwAzuCUCToMHAopwIX60nWYp/oOniNQ?= =?iso-8859-1?q?Sn3IWFbBkkoG+42y6AyDQyk4gaos1GYlqq9tyjWyK3hDPgdxSVdWzAHWL0jk?= =?iso-8859-1?q?2PkMf/kZov6nUuBx9+du/4GXkZslR4Q6uEKM/2DasH0PYi/LfpZonUjYfNBm?= =?iso-8859-1?q?3KgjnQrpKlYovSD0DE986qhYaiVqJkcqVFjFmrSx/XL7w+UHMy/R9BPZN66/?= =?iso-8859-1?q?Eqpm6O2qiGbZhiVf3BlYb3YxkefoqT4vQNjRjqz2/+kAsVeoJ/AYqB1jlIcN?= =?iso-8859-1?q?A7ame1DVCXBEJ0YnmUiY/qOfDCl7tQ03WNJqSi/epmWq7gaVyK9iTU42KdJ0?= =?iso-8859-1?q?kCHL8Sa1WbbwMfxm7ka1S4XFRssQZ06jNQzjMXnacx5qzund3l3G5MSsx71b?= =?iso-8859-1?q?BGd2omd2x8vDedafB02AJIrrlQhnENEH3vmg1GsbEaUfwAmpQe+Eb9p+gMl7?= =?iso-8859-1?q?vCzpeMFHm7a07bPzb5OHuBuikeg25F3D6s31Nt9KuEVU58JtzWpa2mgTWX1q?= =?iso-8859-1?q?yKfmxOCPMjbX+KclogveCTSCCKQwZo3CxBpXpzszg7wWN0nXgP7dAl2I2qiZ?= =?iso-8859-1?q?RaXvD8erBZkss3A6im7t5AqemclJlM5uEuiOzEZse6NBsruJU1i+c8O/bDhU?= =?iso-8859-1?q?eSUjN4W9nba94Tr+N4rISSVPPFeg6YX1ougoe0BqjjBinQkaK6MN6+83zkwE?= =?iso-8859-1?q?OvqErdeCSM3S4oFiOTiBL/f/YA0rRt1zV00rblJu8q0iplDmbOV/kdUxf7u1?= =?iso-8859-1?q?P68AVgY+oJE306pq8+0QLzGQqyKg9ae/s0YH8GRxG4imPc3BqBO8Kab1nxNi?= =?iso-8859-1?q?UvVG7cbryIEBtINzP6M6BU2VKseigDNEzPaD7AoepPoESuKLlcwdMsYRS/i1?= =?iso-8859-1?q?WfXZlnfWlQkUJQQMLHBwNHMxjzssQ0cU14+GqMQB698uBgJKtc4bM4LWrUbZ?= =?iso-8859-1?q?g7+vdOycm2osPjUN6BujfKwoXKhqs7+eNvp6wwkbEO0xtCpVuUusbCrk0W/f?= =?iso-8859-1?q?C80QehXOQHdoVZKdzFqctuy16SW86QG3RD/jkaMBUjkqQ3noOzKI2zH5R4wB?= =?iso-8859-1?q?n0/TXH4Nm1ETCZnc2DSRKPF5dPo4QfB3f/kvMfHV8iYq22WUNfO96G0BhbgB?= =?iso-8859-1?q?8ExCU5gbsv5HxKldmeeWKdXsIJT/mjqNGC8lcauKmdk3Q26sw/5lyoZF7ZqA?= =?iso-8859-1?q?=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: 45937510-9b04-4e64-3dcf-08dab5ad217f X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2022 10:47:22.1678 (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: cEMe6w95m02eM+UaWpV+hKffkk5NdsJ+Ix8AmJyw7aJf3250N2kyPsyNHquZOwi2xKyoLeArFUhqXWWK5fbugeQweR4rZcYcQDl/BxSHJZA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7375 Subject: [ovs-dev] [PATCH ovn 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. Signed-off-by: Felix Huettner Acked-by: Numan Siddique --- tests/ovn-macros.at | 9 +++++---- tests/ovn.at | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) -- 2.38.0 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 Mon Oct 24 10:47:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1693821 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=su2Hc9SB; 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 4MwsGr3lJzz23kR for ; Mon, 24 Oct 2022 21:47:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 927B0405E0; Mon, 24 Oct 2022 10:47:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 927B0405E0 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=su2Hc9SB 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 4THftppZGavV; Mon, 24 Oct 2022 10:47:44 +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 2F39F405C2; Mon, 24 Oct 2022 10:47:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2F39F405C2 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 88115C0086; Mon, 24 Oct 2022 10:47:40 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3A22DC002D for ; Mon, 24 Oct 2022 10:47:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 8C92E4059C for ; Mon, 24 Oct 2022 10:47:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8C92E4059C 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 hSDooUhyz_X9 for ; Mon, 24 Oct 2022 10:47:26 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 20B9D4056F Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2139.outbound.protection.outlook.com [40.107.21.139]) by smtp2.osuosl.org (Postfix) with ESMTPS id 20B9D4056F for ; Mon, 24 Oct 2022 10:47:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nmtCEpaepIfeJB8tsh+0xN9CFRTDo2puTcf6t+mMDL0po/pGgZco/qJ+B/LeouGnyGfOgdMDF3fRKU+TNlG128CQyDRDA/Wuikt7njyLM71ROzWg1pOeXrzqtbsY0DiWLMRlVmnZ1zvTm4WmIAZPWiCU4ooJPwuB8LYnu1k/jeQGEFyQRSxRX+Kvw+qm/NBCCYxgD37UnFa21Y268JZrE2gqgCh62IIevl9nn5o2NT3/umO7WfZLkKi4dRj8tDc1Y3JweGEbsZygWVTVwWyESJAKHWbSiX9uQuFzEopuJVIfw7JPvYXpWydZVqH/+DxiAAdogm372qMNVwGbGj6Xgg== 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=9L8fjtbO2zJXyLbSANZSzTHE3SEM/0/um5H7fCoGYU0=; b=UvfOm1282ZX7oqIitSZbKdR8qesmpVlZ/alitcIIUT+ZMfcZ2WjQwRTZzO0kbZ9G96GqwLyDXmSxKyIrP0c+1m32+oTmZU6GhY5L/q+ISe12NqYELiBtUCxKi1ldJh7n1P2np+kfH/mHd2KUPfpgxo+UY7DMXRObFqCFhopMXslLjYkleZQqYoBrZTqF12ddi1AOK0gK1Y6XJB5NjWnWkurlWvF/mINYchNJapXoUYmR/wQWnS5QgdUN85O/SAxydz5sPhAf3RjhNP9Fo9Ybdsp0Ncu8nCfHlqkj2VRQgoSQVOvS2Ismioh00qdVbYxuopUSG4xI5mfNzLq9+E3fOQ== 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=9L8fjtbO2zJXyLbSANZSzTHE3SEM/0/um5H7fCoGYU0=; b=su2Hc9SB3OL70C0QBGKiyjcjYVSexsSQl499goKOILrDLIduPuv0LP6NV0RhBuSo5tpX3T/iHkb5Rvl1UhK2V0kk5uccTHvkzyz+AGiKCy1ppqMGT4g12sy+WQTC10fugRy9MHXLbHXtjOEh67xKeaZPWivISHmuQFL46fZPsVx+vf7AIOtvkm4bHlV4AV18miB7lQiTonnmQZhEbtHMq50+ThizZMceE9md6o+Q41ujSBrS2Hmq90AyfVsSWlC9j3S4P0skfGvM4rAZcH5YnwmmC44NoZk8bBGBCQoqF0QNZIoIf0eWuoRy0Jmsb7PCMyEgtzME4+JWONvMbl6sLQ== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AS8PR10MB7375.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:615::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Mon, 24 Oct 2022 10:47:23 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d%5]) with mapi id 15.20.5746.023; Mon, 24 Oct 2022 10:47:23 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn 4/4] pinctrl: Send RARPs for external ipv6 interfaces Thread-Index: Adjnlf6wmbop/Jk0SQ62gnDM1kTdBA== Date: Mon, 24 Oct 2022 10:47:23 +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_|AS8PR10MB7375:EE_ x-ms-office365-filtering-correlation-id: 14079238-5b8f-4900-1ea1-08dab5ad226e 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: ofu6l/O91UXLkU9/8ruLAjcmCLa6Xpmig0XrCMzCIqYBbgZeijf9isB9xanXI8hRq7B4DwgSi+4tA0FAHEs9pJEiyVdvQT9k5VqQzfr0JIBpjrszOWSIaUkdbq4Rz6QLbCZKftBc+8zqy5UXvQgaqOZpzwMJ/VmBitaDSflMyNN4vmMlA1onb5714dx5+hitx1SLsDyOLaeB6PYOtUO7tbSepmlWF7343d2lzplgAaJfIguXZnRO/BGuxB2zIHjY+ph9w9cealzIjamUMyiQlvmKqRFBu6YQPV04eS4AztKZOd4vBMELC0nhshIqc5qJq9wkd8rXc3Vnjw0BVmBLO7aJiy3RXgOjfSp+KHmoZk2Brzt+jKUILgsiBnUGTULWU7yTLQOHLphA6AfugfJJNnqUgtmW+bdca09o7GlKyLxaTkFBu+VoYdNSArZ1X2TLjQs0gdsfXHPNBwLh29zNU1w53n6BN2enurrnPMG9GqVaMlOWbiCeUf0RW92F4z9JU+TyetRhx3mO46jF6TuezLQr3eGf5aC+d7i37iUEp05xGCR5UKUMlddg0NE8dlpCJxgzkDIXKMMOBSDPgvoZvYAeGC4/IYLAuy0rZ4ewpfpKmA+7hgTTindMiJG4WYAyqHsHF/xaU4ST8cv8nOupC+lbOmEqlqn0qIpd6ycAO/cAMQZmgQXWa5KIkoqt9ahxfKnEWlhuBBFXo5TzxBj2g6Bkpn6uhZ0INqZeDfzPfPdoAnQeF0esA9/WfdT9Resy9D9A46C4CxhxV741yfPMjmenjSau1n0v7lofL8lZQXA= 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)(136003)(376002)(39860400002)(396003)(366004)(346002)(451199015)(8676002)(33656002)(82960400001)(71200400001)(66574015)(83380400001)(76116006)(478600001)(52536014)(2906002)(9686003)(316002)(38070700005)(8936002)(41300700001)(122000001)(86362001)(38100700002)(6916009)(55016003)(186003)(5660300002)(7696005)(6506007)(64756008)(66556008)(66446008)(66946007)(66476007)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?HW7CxaONEBsvENu0FcnFDMF?= =?iso-8859-1?q?9TXf+9GOlP9zBiKNFO+LOZ37UTpjvB1Ql2/6Rh4OjuXvpzkSU5rl5CoZ+LGD?= =?iso-8859-1?q?jPCfxx5ixjFXcs0jNjbn53hvqFhYx8mVO56D2WsD0anV3O4/pUk5jS5bGBDd?= =?iso-8859-1?q?2qTHINz+3GwJV6Oc3JqK7/6B6c13dz5c32h3ywmAC6BTWUpvYoIi9gxEcGd/?= =?iso-8859-1?q?L0ZaiQomzfF8bBOIszgLL4KYkNhitl5Cp/jSLHNSyGyLbtRRBDQiRjLp2PzW?= =?iso-8859-1?q?TmCAJcWC1x2W0x3yd3pBSqNSzaRxWm36badduVv9Dy+iFSXj/69ahXXx7Sp3?= =?iso-8859-1?q?+o51dOsfX9fmQe4pIie/nTcX4G2DCUAA0vg9+0hn3oxofet7Ten+MU2qzJqw?= =?iso-8859-1?q?1yG7GWrNwcMqVRwX0w2erlLt5qc1xXAewemoSt3p+iky7ZbmsbkUTHFe2eEQ?= =?iso-8859-1?q?Hs+dyC+Wy/KAEnVuwxeCd3H4j5lowI0nnQmYVCiYhqMOF00b0Fz5t2RnzlFc?= =?iso-8859-1?q?QGYf0AXAOT4REOOHTR+YLMev7sVCcw/NWrUxG5vvDg3UFDPT3L/pFBcjPtgx?= =?iso-8859-1?q?3c3x/kM/5q4Z6hNQDGl/lTV7XDFU2ilRQVYlBkcA2XqvGSFFqw7YPaX5K/xU?= =?iso-8859-1?q?tIQMlNEDQCAwArwICu26uM9Rrtx6uNLLbnb3JKGY3k/Q8WniqP5GOIxapf4w?= =?iso-8859-1?q?rGrj2VUi9NftLur+BCKS1+E5ityh9SL4uoAseU6hUl6OCHvqr/XmVerB8fBh?= =?iso-8859-1?q?MU/YtreB/fFU9Ud6qBMfqV5RwjxyVZ38MgBmmRs+FsoL4aOmHmSmA1yMS983?= =?iso-8859-1?q?DgUv00ozKSSsxFwMblccDScO3nxh8IFjQrjnAlKqgMp9Y7+8aoLM8IGky1P9?= =?iso-8859-1?q?EjRQxSaGW5Q90bnd6hbTuSbqnfWv6/O87Ftu/QPqhPk/BdMi74wVcClxAopo?= =?iso-8859-1?q?xvYbdZxNNbzfC91igpdZ4aVbGacf+JAmTY85t5JKYxB+/I3mmlZpeLAWxg5M?= =?iso-8859-1?q?QYmE2ZXUjFZ6HUnwpgUmgivMiCAlyS0Y/uepvEzwVY2CD2CXtIIBQhg8+sef?= =?iso-8859-1?q?Q/2PsP27nfkjFbr0CiNaLDVbOhpiYHMcEwTI6XSNKLwVG94flcFL3xmAaw0/?= =?iso-8859-1?q?ER7+NA2BAwMYSJ9OeCnuJYLKqQo2EwIb5iubXx4ar2CTkgJPGQd/LODn5eWv?= =?iso-8859-1?q?fQNVB7POME/+baBRYSjPGrRe11FLGIDQN821komRUobYkFVmeHkJxPdnZOLs?= =?iso-8859-1?q?m6AAcuxCm7OmGwfYEFmiHm3Q0VHXt0M/G/whgIeK62KkF+WiA01q6blUTfCB?= =?iso-8859-1?q?VgA8dLFmug5yL+XR88Rkt4KChym60Eoz9z4msWmAj0E5C1fIcrktCacPiaeK?= =?iso-8859-1?q?M7fg8OCfnh/+pO9fwZndxZPzVZJGQMpoobZG+YxvNts+s4cB3B/bpbse+g3b?= =?iso-8859-1?q?RFZARr4rTSdkihwiM8QDdKsX7SRq4CDtiJ4efSx88h/+JbzUd88Oi5Sg3v6+?= =?iso-8859-1?q?CY0G5dO1FnaMqKMW4RPBB8lbKzrRhrEYxWpcqMUdweuiXMyZ0Zw7O9Dcrd2B?= =?iso-8859-1?q?Db2sZWAuv7bQs/mTyijdMpathnlkne7iFhU1jY7td8DZkncYfasIp+fCaduQ?= =?iso-8859-1?q?Ij7PDDXrhOVN1EnlysegScr9v11x6Bnk//nZhejGO7rDSxsOlfH4xTUWjd8o?= =?iso-8859-1?q?=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: 14079238-5b8f-4900-1ea1-08dab5ad226e X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2022 10:47:23.7489 (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: 82rO6k2iOLYxrGGsPOVG6UMafl3kkP+tbl5+0V7PMuZL+wpJc0nDrzxa8xjKGWZV1F61DlYAUdkzsqRLpmjR0iB3mbecIb+wOFHJ4WcZMdM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7375 Subject: [ovs-dev] [PATCH ovn 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. Signed-off-by: Felix Huettner Acked-by: Numan Siddique --- controller/pinctrl.c | 23 +++++++++++++ tests/ovn.at | 80 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 99 insertions(+), 4 deletions(-) -- 2.38.0 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])