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