From patchwork Fri Nov 4 08:59:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1699404 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=k/ZH6v6i; 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 4N3ZMQ5YVqz23lK for ; Fri, 4 Nov 2022 20:00:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id DDA4B40C1E; Fri, 4 Nov 2022 09:00:00 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org DDA4B40C1E 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=k/ZH6v6i 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 c9XfzKm08fRM; Fri, 4 Nov 2022 08:59:59 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id D1D5E40C00; Fri, 4 Nov 2022 08:59:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D1D5E40C00 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A892FC0033; Fri, 4 Nov 2022 08:59:58 +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 CDE7FC0033 for ; Fri, 4 Nov 2022 08:59:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9C15B40BFB for ; Fri, 4 Nov 2022 08:59:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9C15B40BFB 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 5zR3C5AJ3XC7 for ; Fri, 4 Nov 2022 08:59:56 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9E92A40BF3 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2130.outbound.protection.outlook.com [40.107.20.130]) by smtp2.osuosl.org (Postfix) with ESMTPS id 9E92A40BF3 for ; Fri, 4 Nov 2022 08:59:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ww2E04wTQJcoS0ZASOBV1uP374ph9X5iz4nuJe5rmNElQR2vP96z3kKftOIxIAr378rQEXcFTeX4ZNR/ElvKcuBFkVyhHiiiNPzyDymXOZ0FYj8LgYvr3rv1b7WpNOPOPPEashuNrbXuBJIxh9WNTS1HoGX5OCIuj327Qh1wEoSInJtEUUUpsc0sZWk2SE7r9uXr39MPvS9jeMyun5H8oTGdYQobBARotUxcW2JGLFW7eWFUN7UXJyi7kprlGA9z43xuMvFF74AeGjQFxngCcEm3hiAZw/6SLEko7O8M9k3UYPT5GEPozYhVyVDdCM+9pian2lSEmKdYcTmipklK4Q== 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=afA85Ik6NgMKXnG9sGFT9FW8DDb0uA22xodDYn0O8LZ72oRyzc/0CHcHuO+mPq0PjRfkMwyJWIoj0+yfAvPXHCBZd/k0Anw6VbJMD2O9PVqeYFk3Nf+RDoB/zsyZ6IasTJyClx8Q/O95HJMzkDN98dXC4rl61bFEEaVySbLkOk8mgGH6k9ACSD/Kab+2zjKgVbAjUWqkaj92/spU72vQI4iYlViTZJAP0ZIcPaRSZ52YeLqOsoc3Anlq+LPqtEnQGFqyc0tJSIY8vlp8iKKhKKzrlNW2z4DKuuoV7+1mp6Ko6SKnKFlBSselI+wOZa+FBs70EClhdtlfcOewDWDAOA== 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=k/ZH6v6iAGozsm3t2bFKkgv+M5fImN0Mawef6plS56GOe0RPy31sUckLFnZU2u3g5o7bwGDH2lG/05vphyG4FvvYxK9uEhR391J/kVKiethb8N2l2bLTEqocKbszxVCLDMCiAdTNno3jv6eD77z20/9wxQp4HhoKStp5nHhNNK1YhFdrqN0DRj7MH7utwmy38rqLSoV6DHL2j4I1NYQF/WvVVvNZEFrrUCTj2Z+pxz88sUNLk/4zQAUJYMT076QsWKG0vYpby9VBV80s8hDObu8+V/xyRkjp9ESX0WyFjICvV53URAg7deULwjO3JLNtaN/gqdFrrayshgkkom3nkg== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AS2PR10MB6616.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:55f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Fri, 4 Nov 2022 08:59:54 +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; Fri, 4 Nov 2022 08:59:54 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn v3 1/4] logical-fields: add rarp fields Thread-Index: AdjwKvsImGFCRIHpSJivJbEcz6XW+g== Date: Fri, 4 Nov 2022 08:59:54 +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_|AS2PR10MB6616:EE_ x-ms-office365-filtering-correlation-id: 3e81be55-2587-4d94-33ed-08dabe42f0f9 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: mOwsiaFU6T3wi6ba91LfMBAPLghKSsCEqfys7IJGKw1l10SgogifHFtPktA8fjyhqL6ApiYfRQd4TKGxQ3dlRia19zfVL6mZmYJ5wZzjY1ujt9TiT8a6chsVkDG0pBv5DYupW8L8ugEOZyKKHDL1qVNSKGaqVlTelztUCeHN6ChSdUDrouRV7zNeDLk0cpv5uYgmvmsZJJHML+ZxYcLJ6t+iCcP9ol7txOV13wkOmjtChsrGV6dVbxN2hTPG5uRoN3qSBIxmqO0kk9+3aC7AVOGHBQc2iJiFyLwq7GkS8DZeZZPs8TqTIOd1D/HO2taLBNxvdBZwUKsxhf41xxrK5T7+vhh4Xrgc08FkQD0IvcEoajT6ErHJxXwdQOy7x4CsQhlozYnJPvu6hRzpmFhsRRNqtu+yBq6CUSPipclGM1IQICepdsRy8vNzbY7XeM/lGZzVlsXdEpWeuYXRzVB76bzRzStavQaCcif5lBmCTQTw3ZoJa3bA9YatKYTIbzKFg/Um8prA84h6QB8Gjf3juCxjDMVK/vWPv+cTzhC9bSZKuvJDFNE4rX+EsTGKlkUivEwPXa9RwU8Ivoyns1807EjPCZ9eTYOnyTI056uZS2JtztgNF2LCCLIwlR8gvhoGv4JCurs7hWnMh1ShrvruJ+xFen1bvy6agYQHpLQUDVeHRyz/qe3LWJlAdGCOGbGediAbYXLwKELB4O+5l+DZRsjmPFigP1HhR8qhHKTnDvi7FTYP33v3J4WG8fpLAYW77COOJzFG0j/iG7xnPJTsmV3wvW2zLWZAVsVU0a/u6NA= 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)(396003)(136003)(376002)(39860400002)(366004)(451199015)(186003)(66574015)(8676002)(83380400001)(2906002)(66446008)(64756008)(7696005)(66556008)(66476007)(6506007)(66946007)(478600001)(5660300002)(76116006)(38100700002)(71200400001)(86362001)(82960400001)(122000001)(52536014)(8936002)(316002)(6916009)(9686003)(41300700001)(33656002)(55016003)(38070700005)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?cpqZSRnypCjxRnHjaA2Xb07?= =?iso-8859-1?q?jhZmZuezm8siGqaHgCfLtKQThMquz67QFjXqzc319+SBzED/uA5h+niR39JF?= =?iso-8859-1?q?L7YmuM1wI4zoXme4L2sKxMl0ALeG3PXjB7eF4cwu58KlbYgEOzUD6W7RqZNr?= =?iso-8859-1?q?SfkF7QtKr07bAvIj9x8AhrKskCUjd1eoiCIY7k+T1cUnTLQoHm84ahaDcsmu?= =?iso-8859-1?q?BmUvtcwvm2DdAvMKKt5+MWDbTwGomFPAIIr+pVVIRPMBrEa6HICVhnvCY3aT?= =?iso-8859-1?q?fKTP2JPHvS/9MoMiRl7UhXL1z1n+SFmoBUcmICXmTq5yNv5Bdtn7w6O5wLrY?= =?iso-8859-1?q?er6M5wqEf5OPgqJs8H2ZZmF8gdZbcrHAvg8O6BEcfb1GCvOO8egfCk9yGxz7?= =?iso-8859-1?q?CqAz4U+mZKHnLDD3OkKdVkx1r8egjta1I3k3hjC0z9IwU1YjInW7GZsr2ROd?= =?iso-8859-1?q?sqgzBYkfbbIWchlVs9ypxkIveQBKyCq6cNqHw9m0yCVYU5OuBlgbQet77xkS?= =?iso-8859-1?q?cG4t54z49hEIToHdBhFrQ1syxKYQ8zbJ+oTabpLQ7H/RmGkIUoBmISUHZzQY?= =?iso-8859-1?q?+ZpVuqwMt3QhjJqXz7j4JFHhKlGqdTJO1TVYKza8P9cgEJm281p2SkBHtUq0?= =?iso-8859-1?q?bEGXf/T76gZksmcXPeR2WxniqonEwTodq4eTloFP/k3LiU8W/gwgqUZ6v1if?= =?iso-8859-1?q?ncBokxPsQdNXCfBkvWJuiymg01bfqjWNYbWw+KKHNlqGl1a/eQaeuxvQfs++?= =?iso-8859-1?q?50PzInvJCxRItGaGZhCpMlDQtPCsrJvuL4y023JJxz9QvAT2UO1buVrBjuPE?= =?iso-8859-1?q?qw2EeBAS/+ZEKPL7d/JMGc+mzVzdkA/GJ+1ivM0USb56LWYC7K3ERIKc52s4?= =?iso-8859-1?q?UDzete9hAh+31v8u856SpgNZNF7F6W35d4MC5wKyFqiPEoxRCUuv+bWA8BnV?= =?iso-8859-1?q?nmwP1qgFYMaHSSovbwMe4s6vukv/nVxly0GGQDwpWKLd/pnDnkBhtdgxPeBZ?= =?iso-8859-1?q?fQzmPPd94xMmafcHeIK9m6nhbJMjdeErE/K6UfsU5CBbdZYT71grutXj6DNe?= =?iso-8859-1?q?7uBPZwAVvKVr/uV1sfpWSssJ0KvETWhAvCAyA1a3DAVUf8rYGpWD2xm4O1fT?= =?iso-8859-1?q?oMIGZU+xNIefoWUO1ZuVsJmaaRyizyOBxb5M4FzATb/mZ5zdva/tXkZJI0Q1?= =?iso-8859-1?q?EZE36NzlDnAY4egEL8zYpCUdFSwd2tKZ84ttHIHwIr4TvskVOpExisWFmYQq?= =?iso-8859-1?q?Svl1Ty8OfbHh2zDgPWJlKXxvPwvSrycLJEvh8DsXfZ610t2VPd29UINo0R+G?= =?iso-8859-1?q?XTvP+K3gp8yssd30PaFC43k1rVHCwWGacvwI0ETzdHT0Tz/5s3pRpD70SjrB?= =?iso-8859-1?q?5KIACEfg9YoGU9U8QXX8TWePgk9Zh0MJlsGm/fu57i2nYi1uytRNUsenqukF?= =?iso-8859-1?q?tg8cZe/V1c2Nc60IzHmbhoB2cRJlkhGjgXYqxUWyT+5Od3hGyUDMNRPEYnQy?= =?iso-8859-1?q?RFKF3yO4p71vgZho+uKAUhzNBhnyNjwsde8up6jrvYzT5o0AoYCNzM6At/f4?= =?iso-8859-1?q?rZeH31XMThZFI0dQAqEbIGPcm0hDa21imwlVkPvQVn3ykUiNAvEv/SQ1Mu7f?= =?iso-8859-1?q?yHGvgscVhBvTOyFAD1HHQtVQiyhT/s3ZtknDCYr7jD8XhL0VZCshCnmVINVD?= =?iso-8859-1?q?TGoNfGXQ+Vy/PnRASKlR7ZI8BpVd+2Q7DuEPV7qNhfw=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: 3e81be55-2587-4d94-33ed-08dabe42f0f9 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Nov 2022 08:59:54.6172 (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: nRdryagTl3NLy9uQxdAI2rxd59KbCEx3QcKHarNH2DARpLja9i90Wu8fvuupYxODdWLn0No4NKzYGUrAfEIOkrYJ7QMzKjHYVKXLatu//G8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB6616 Subject: [ovs-dev] [PATCH ovn v3 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