Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2194813/?format=api
{ "id": 2194813, "url": "http://patchwork.ozlabs.org/api/patches/2194813/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ovn/patch/20260210013505.81343-1-mj.ponsonby@canonical.com/", "project": { "id": 68, "url": "http://patchwork.ozlabs.org/api/projects/68/?format=api", "name": "Open Virtual Network development", "link_name": "ovn", "list_id": "ovs-dev.openvswitch.org", "list_email": "ovs-dev@openvswitch.org", "web_url": "http://openvswitch.org/", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260210013505.81343-1-mj.ponsonby@canonical.com>", "list_archive_url": null, "date": "2026-02-10T01:35:05", "name": "[ovs-dev,v2] Update OVN to handle OVS 3.7.", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "42fcf7318606ed15462d7ee0b95bb8f8f7bbda81", "submitter": { "id": 88871, "url": "http://patchwork.ozlabs.org/api/people/88871/?format=api", "name": "MJ Ponsonby", "email": "mj.ponsonby@canonical.com" }, "delegate": { "id": 94943, "url": "http://patchwork.ozlabs.org/api/users/94943/?format=api", "username": "dceara", "first_name": "Dumitru", "last_name": "Ceara", "email": "dceara@redhat.com" }, "mbox": "http://patchwork.ozlabs.org/project/ovn/patch/20260210013505.81343-1-mj.ponsonby@canonical.com/mbox/", "series": [ { "id": 491587, "url": "http://patchwork.ozlabs.org/api/series/491587/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ovn/list/?series=491587", "date": "2026-02-10T01:35:05", "name": "[ovs-dev,v2] Update OVN to handle OVS 3.7.", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/491587/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2194813/comments/", "check": "success", "checks": "http://patchwork.ozlabs.org/api/patches/2194813/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<ovs-dev-bounces@openvswitch.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "dev@openvswitch.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "ovs-dev@lists.linuxfoundation.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (4096-bit key;\n unprotected) header.d=canonical.com header.i=@canonical.com\n header.a=rsa-sha256 header.s=20251003 header.b=k3uf1rh2;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org)", "smtp2.osuosl.org;\n\tdkim=fail reason=\"signature verification failed\" (4096-bit key)\n header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256\n header.s=20251003 header.b=k3uf1rh2", "smtp3.osuosl.org; dmarc=pass (p=reject dis=none)\n header.from=canonical.com", "smtp3.osuosl.org;\n dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com\n header.a=rsa-sha256 header.s=20251003 header.b=k3uf1rh2" ], "Received": [ "from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4f93z71rXmz1xvb\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 10 Feb 2026 12:35:15 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp2.osuosl.org (Postfix) with ESMTP id 7C6B440680;\n\tTue, 10 Feb 2026 01:35:13 +0000 (UTC)", "from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id u5a28AU82Qew; Tue, 10 Feb 2026 01:35:12 +0000 (UTC)", "from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])\n\tby smtp2.osuosl.org (Postfix) with ESMTPS id 5DB574005A;\n\tTue, 10 Feb 2026 01:35:12 +0000 (UTC)", "from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id 30F19C077F;\n\tTue, 10 Feb 2026 01:35:12 +0000 (UTC)", "from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n by lists.linuxfoundation.org (Postfix) with ESMTP id C3647C077E\n for <dev@openvswitch.org>; Tue, 10 Feb 2026 01:35:10 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id B5C3860DA7\n for <dev@openvswitch.org>; Tue, 10 Feb 2026 01:35:10 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id OHy8iyJXA3XD for <dev@openvswitch.org>;\n Tue, 10 Feb 2026 01:35:10 +0000 (UTC)", "from smtp-relay-canonical-1.canonical.com\n (smtp-relay-canonical-1.canonical.com [185.125.188.121])\n by smtp3.osuosl.org (Postfix) with ESMTPS id DF8AB60DA6\n for <dev@openvswitch.org>; Tue, 10 Feb 2026 01:35:09 +0000 (UTC)", "from Trianon.. (unknown [88.98.250.2])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id CB58340005;\n Tue, 10 Feb 2026 01:35:06 +0000 (UTC)" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.9.56;\n helo=lists.linuxfoundation.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5DB574005A", "OpenDKIM Filter v2.11.0 smtp3.osuosl.org DF8AB60DA6" ], "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=185.125.188.121;\n helo=smtp-relay-canonical-1.canonical.com;\n envelope-from=mj.ponsonby@canonical.com; receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp3.osuosl.org DF8AB60DA6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1770687306;\n bh=ifDssZGku4zY4GsPlzCbzMmc0Qw/YWjoGhsnNhxRCu8=;\n h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n MIME-Version;\n b=k3uf1rh2hzNmB8XQUnilMuNI2DOKoUvK1GFblIosD6jB4Pzcn7ovls9vJq5//F5Bz\n VjzgNMonl4OzmmLOlL2XwM6RKfwpDsl/swKYdtuh/JMF/C3/8WSj7daoNMecmNqeIH\n SDat7oEpLgkxjsj7sfqjIuE2vTh/t+ZB7mcGPA6RawgTfOJGvEqmWnmdtdxVNgQf6v\n /VpTZl4OTrPQg3mVH+aksgEYShS3QhaRDRn67YfZv6NM6CMk5kW0tPRqmF7NWEhKjJ\n y7ZwirDany3lbldKylmyGyArCy/WVRiCAvPddy0witOWolB8g7zWkH1m+hojU7s20X\n PeqSO8+jPzds+X26WwXYbZ79CVuS8JJGh7U7QdfSWMzFxYlJ21c22jSB2owcsFxADc\n iKs2zPZnoV3lksE3fwvUtBL/L2oRrEUGm6k7GlJKXP20ADXajPqLkgHteyXoxC6YKq\n l22DosnXXp7Ls27/oj5Q4+U+eicyHPi6UqsiahYlYVhwVGGXMvfX4W6Ge0MHbDg8r3\n Pwfe3o5kObuKWHRfsqaenz/RkwznM4emxXXeuVa8dW6CCHnh2uobya+OO1MGxSybaV\n bg2g/clCq50yRezWGaqYDtfDxZiLL/7u4B1asL6eY6YGK/+NH2q7LRXrFlWr8bIblE\n A502ijuLm9rnaCZr0NLilOsI=", "To": "dev@openvswitch.org", "Cc": "dceara@redhat.com, i.maximets@ovn.org,\n MJ Ponsonby <mj.ponsonby@canonical.com>", "Date": "Tue, 10 Feb 2026 01:35:05 +0000", "Message-ID": "<20260210013505.81343-1-mj.ponsonby@canonical.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260209175421.59069-1-mj.ponsonby@canonical.com>", "References": "<20260209175421.59069-1-mj.ponsonby@canonical.com>", "MIME-Version": "1.0", "Subject": "[ovs-dev] [PATCH ovn v2] Update OVN to handle OVS 3.7.", "X-BeenThere": "ovs-dev@openvswitch.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "<ovs-dev.openvswitch.org>", "List-Unsubscribe": "<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>", "List-Archive": "<http://mail.openvswitch.org/pipermail/ovs-dev/>", "List-Post": "<mailto:ovs-dev@openvswitch.org>", "List-Help": "<mailto:ovs-dev-request@openvswitch.org?subject=help>", "List-Subscribe": "<https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=subscribe>", "From": "MJ Ponsonby via dev <ovs-dev@openvswitch.org>", "Reply-To": "MJ Ponsonby <mj.ponsonby@canonical.com>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "ovs-dev-bounces@openvswitch.org", "Sender": "\"dev\" <ovs-dev-bounces@openvswitch.org>" }, "content": "This both bumps the OVS submodule and fixes various breaking changes\nintroduced in OVS version 3.7.0.\n\n- OVS commit dc14e92 updates route_table_handle_msg_callback to have a\n 3rd parameter 'uint32_t table', which allows us to remove table_id from\n the route_msg_handle_data struct provided we update handle_route_msg\n accordingly.\n- OVS commit 3900653 changes FLOW_N_REGS from 16 to 32, to avoid version\n incompatibility errors we set OVN_FLOW_N_REGS_SUPPORTED which is 16,\n and is checked to be within FLOW_N_REGS. We then check that the\n various MFF_LOG declarations fall within this still.\n\nThis should allow us to sync up with OVS again in preparation for 26.03.\n\nSigned-off-by: MJ Ponsonby <mj.ponsonby@canonical.com>\n---\n controller/pinctrl.c | 2 +-\n controller/route-exchange-netlink.c | 9 +++----\n include/ovn/logical-fields.h | 42 +++++++++++++++++++++++++++++\n lib/actions.c | 5 +---\n ovs | 2 +-\n utilities/ovn-trace.c | 2 +-\n 6 files changed, 50 insertions(+), 12 deletions(-)", "diff": "diff --git a/controller/pinctrl.c b/controller/pinctrl.c\nindex 7baf6b488..08940cd8b 100644\n--- a/controller/pinctrl.c\n+++ b/controller/pinctrl.c\n@@ -6368,7 +6368,7 @@ static void\n reload_metadata(struct ofpbuf *ofpacts, const struct match *md)\n {\n enum mf_field_id md_fields[] = {\n-#if FLOW_N_REGS == 16\n+#if OVN_FLOW_N_REGS_SUPPORTED == 16\n MFF_REG0,\n MFF_REG1,\n MFF_REG2,\ndiff --git a/controller/route-exchange-netlink.c b/controller/route-exchange-netlink.c\nindex 7ab0690f2..1fb41008c 100644\n--- a/controller/route-exchange-netlink.c\n+++ b/controller/route-exchange-netlink.c\n@@ -205,17 +205,18 @@ struct route_msg_handle_data {\n struct vector *learned_routes;\n struct vector *stale_routes;\n const struct hmap *routes;\n- uint32_t table_id; /* requested table id. */\n };\n \n static void\n-handle_route_msg(const struct route_table_msg *msg, void *data)\n+handle_route_msg(const struct route_table_msg *msg,\n+ void *data,\n+ uint32_t table_id)\n {\n struct route_msg_handle_data *handle_data = data;\n const struct route_data *rd = &msg->rd;\n struct advertise_route_entry *ar;\n \n- if (handle_data->table_id != rd->rta_table_id) {\n+ if (table_id != rd->rta_table_id) {\n /* We do not have the NLM_F_DUMP_FILTERED info here, so check if the\n * reported table_id matches the requested one.\n */\n@@ -342,7 +343,6 @@ re_nl_sync_routes(uint32_t table_id, const struct hmap *routes,\n .learned_routes = learned_routes,\n .stale_routes = &stale_routes,\n .db = db,\n- .table_id = table_id,\n };\n route_table_dump_one_table(table_id, handle_route_msg, &data);\n \n@@ -388,7 +388,6 @@ re_nl_cleanup_routes(uint32_t table_id)\n .routes_to_advertise = NULL,\n .learned_routes = NULL,\n .stale_routes = &stale_routes,\n- .table_id = table_id,\n };\n route_table_dump_one_table(table_id, handle_route_msg, &data);\n \ndiff --git a/include/ovn/logical-fields.h b/include/ovn/logical-fields.h\nindex f0d34196a..00e6f1bd7 100644\n--- a/include/ovn/logical-fields.h\n+++ b/include/ovn/logical-fields.h\n@@ -26,53 +26,95 @@ enum ovn_controller_event {\n OVN_EVENT_MAX,\n };\n \n+/* OVS versions 2.6 to 3.6 support up to 16 32-bit registers. These can be\n+ * used unconditionally. Registers above MFF_REG15, MFF_XREG7 and MFF_XXREG3\n+ * are only supported in newer versions and must not be used without prior\n+ * support detection. */\n+#define OVN_FLOW_N_REGS_SUPPORTED 16\n+BUILD_ASSERT_DECL(FLOW_N_REGS == 32);\n+BUILD_ASSERT_DECL(FLOW_N_REGS >= OVN_FLOW_N_REGS_SUPPORTED);\n+\n+#define CHECK_REG(NAME) \\\n+ BUILD_ASSERT_DECL( \\\n+ MFF_LOG_##NAME < MFF_REG0 + OVN_FLOW_N_REGS_SUPPORTED)\n+\n+#define CHECK_XXREG(NAME) \\\n+ BUILD_ASSERT_DECL( \\\n+ MFF_LOG_##NAME < MFF_XXREG0 + OVN_FLOW_N_REGS_SUPPORTED / 4)\n+\n+\n /* Logical fields.\n *\n * These values are documented in ovn-architecture(7), please update the\n * documentation if you change any of them. */\n #define MFF_LOG_DATAPATH MFF_METADATA /* Logical datapath (64 bits). */\n #define MFF_LOG_FLAGS MFF_REG10 /* One of MLF_* (32 bits). */\n+CHECK_REG(FLAGS);\n #define MFF_LOG_DNAT_ZONE MFF_REG11 /* conntrack dnat zone for gateway router\n * (32 bits). */\n+CHECK_REG(DNAT_ZONE);\n #define MFF_LOG_SNAT_ZONE MFF_REG12 /* conntrack snat zone for gateway router\n * (32 bits). */\n+CHECK_REG(SNAT_ZONE);\n #define MFF_LOG_CT_ZONE MFF_REG13 /* Logical conntrack zone for lports\n * (0..15 of the 32 bits). */\n+CHECK_REG(CT_ZONE);\n #define MFF_LOG_ENCAP_ID MFF_REG13 /* Encap ID for lports\n * (16..31 of the 32 bits). */\n+CHECK_REG(ENCAP_ID);\n #define MFF_LOG_INPORT MFF_REG14 /* Logical input port (32 bits). */\n+CHECK_REG(INPORT);\n #define MFF_LOG_OUTPORT MFF_REG15 /* Logical output port (32 bits). */\n+CHECK_REG(OUTPORT);\n #define MFF_LOG_TUN_OFPORT MFF_REG5 /* 16..31 of the 32 bits */\n+CHECK_REG(TUN_OFPORT);\n \n /* Logical registers.\n *\n * Make sure these don't overlap with the logical fields! */\n #define MFF_LOG_REG0 MFF_REG0\n+CHECK_REG(REG0);\n #define MFF_LOG_LB_ORIG_DIP_IPV4 MFF_REG4\n+CHECK_REG(LB_ORIG_DIP_IPV4);\n #define MFF_LOG_LB_ORIG_TP_DPORT MFF_REG2\n+CHECK_REG(LB_ORIG_TP_DPORT);\n \n #define MFF_LOG_XXREG0 MFF_XXREG0\n+CHECK_XXREG(XXREG0);\n #define MFF_LOG_LB_ORIG_DIP_IPV6 MFF_XXREG1\n+CHECK_XXREG(LB_ORIG_DIP_IPV6);\n \n #define MFF_N_LOG_REGS 10\n \n+BUILD_ASSERT_DECL(MFF_LOG_REG0 + MFF_N_LOG_REGS \\\n+ <= MFF_REG0 + OVN_FLOW_N_REGS_SUPPORTED);\n+\n #define MFF_LOG_LB_AFF_MATCH_IP4_ADDR MFF_REG4\n+CHECK_REG(LB_AFF_MATCH_IP4_ADDR);\n #define MFF_LOG_LB_AFF_MATCH_IP6_ADDR MFF_XXREG1\n+CHECK_XXREG(LB_AFF_MATCH_IP6_ADDR);\n #define MFF_LOG_LB_AFF_MATCH_PORT MFF_REG2\n+CHECK_REG(LB_AFF_MATCH_PORT);\n \n #define MFF_LOG_RESULT_REG MFF_XXREG1\n+CHECK_XXREG(RESULT_REG);\n \n #define MFF_LOG_CT_SAVED_STATE MFF_REG4\n+CHECK_REG(CT_SAVED_STATE);\n \n #define MFF_LOG_REMOTE_OUTPORT MFF_REG1 /* Logical remote output\n * port (32 bits). */\n+CHECK_REG(REMOTE_OUTPORT);\n \n /* Logical registers that are needed for backwards\n * compatibility with older northd versions.\n * XXX: All of them can be removed in 26.09. */\n #define MFF_LOG_LB_ORIG_DIP_IPV4_OLD MFF_REG1\n+CHECK_REG(LB_ORIG_DIP_IPV4_OLD);\n #define MFF_LOG_LB_AFF_MATCH_PORT_OLD MFF_REG8\n+CHECK_REG(LB_AFF_MATCH_PORT_OLD);\n #define MFF_LOG_LB_AFF_MATCH_LS_IP6_ADDR_OLD MFF_XXREG0\n+CHECK_XXREG(LB_AFF_MATCH_LS_IP6_ADDR_OLD);\n \n /* Maximum number of networks supported by 4-bit flags.network_id. */\n #define OVN_MAX_NETWORK_ID \\\ndiff --git a/lib/actions.c b/lib/actions.c\nindex 6d1230e1e..2d6df5f81 100644\n--- a/lib/actions.c\n+++ b/lib/actions.c\n@@ -1486,10 +1486,7 @@ encode_ct_lb(const struct ovnact_ct_lb *cl,\n ds_put_format(&ds, \",fields(%s)\", cl->hash_fields);\n }\n \n- BUILD_ASSERT(MFF_LOG_CT_ZONE >= MFF_REG0);\n- BUILD_ASSERT(MFF_LOG_CT_ZONE < MFF_REG0 + FLOW_N_REGS);\n- BUILD_ASSERT(MFF_LOG_DNAT_ZONE >= MFF_REG0);\n- BUILD_ASSERT(MFF_LOG_DNAT_ZONE < MFF_REG0 + FLOW_N_REGS);\n+ BUILD_ASSERT(OVN_FLOW_N_REGS_SUPPORTED == 16);\n \n size_t n_active_backends = 0;\n for (size_t bucket_id = 0; bucket_id < cl->n_dsts; bucket_id++) {\ndiff --git a/ovs b/ovs\nindex 5be77f1ec..1d57509ef 160000\n--- a/ovs\n+++ b/ovs\n@@ -1 +1 @@\n-Subproject commit 5be77f1ecc521174af188ce9a9372c89db0d22e8\n+Subproject commit 1d57509ef1cc9ff7fbd6e450a5bb82e91480959f\ndiff --git a/utilities/ovn-trace.c b/utilities/ovn-trace.c\nindex 8708a50c3..46cc65fa0 100644\n--- a/utilities/ovn-trace.c\n+++ b/utilities/ovn-trace.c\n@@ -1696,7 +1696,7 @@ execute_output(const struct ovntrace_datapath *dp, struct flow *uflow,\n }\n \n struct flow egress_uflow = *uflow;\n- for (int i = 0; i < FLOW_N_REGS; i++) {\n+ for (int i = 0; i < OVN_FLOW_N_REGS_SUPPORTED; i++) {\n if (i != MFF_LOG_INPORT - MFF_REG0 &&\n i != MFF_LOG_OUTPORT - MFF_REG0) {\n egress_uflow.regs[i] = 0;\n", "prefixes": [ "ovs-dev", "v2" ] }