{"id":2197645,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2197645/?format=json","project":{"id":68,"url":"http://patchwork.ozlabs.org/api/1.0/projects/68/?format=json","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":""},"msgid":"<e493c793c362f80971a523cf5a47d064dba7e3b8.1771408243.git.lorenzo.bianconi@redhat.com>","date":"2026-02-18T10:01:42","name":"[ovs-dev,v3,2/2] northd: Add lflow-ip for logical_switch creation/deletion.","commit_ref":null,"pull_url":null,"state":"deferred","archived":false,"hash":"55606eeaf47f3d936e6aae6865622d439d66c53b","submitter":{"id":73083,"url":"http://patchwork.ozlabs.org/api/1.0/people/73083/?format=json","name":"Lorenzo Bianconi","email":"lorenzo.bianconi@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ovn/patch/e493c793c362f80971a523cf5a47d064dba7e3b8.1771408243.git.lorenzo.bianconi@redhat.com/mbox/","series":[{"id":492530,"url":"http://patchwork.ozlabs.org/api/1.0/series/492530/?format=json","date":"2026-02-18T10:01:40","name":"northd: Add lflow-ip for logical_switch creation/deletion.","version":3,"mbox":"http://patchwork.ozlabs.org/series/492530/mbox/"}],"check":"fail","checks":"http://patchwork.ozlabs.org/api/patches/2197645/checks/","tags":{},"headers":{"Return-Path":"<ovs-dev-bounces@openvswitch.org>","X-Original-To":["incoming@patchwork.ozlabs.org","ovs-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\" (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=b4fcclKL;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=140.211.166.137; helo=smtp4.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org)","smtp4.osuosl.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key)\n header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=b4fcclKL","smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none)\n header.from=redhat.com","smtp3.osuosl.org;\n dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com\n header.a=rsa-sha256 header.s=mimecast20190719 header.b=b4fcclKL"],"Received":["from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 4fGBrX566yz1xpl\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 18 Feb 2026 21:02:20 +1100 (AEDT)","from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 897A74078D;\n\tWed, 18 Feb 2026 10:02:18 +0000 (UTC)","from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id 0lw0czXijfeI; Wed, 18 Feb 2026 10:02:16 +0000 (UTC)","from lists.linuxfoundation.org (lf-lists.osuosl.org\n [IPv6:2605:bc80:3010:104::8cd3:938])\n\tby smtp4.osuosl.org (Postfix) with ESMTPS id 1D78B40776;\n\tWed, 18 Feb 2026 10:02:16 +0000 (UTC)","from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id ED0C3C0035;\n\tWed, 18 Feb 2026 10:02:15 +0000 (UTC)","from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n by lists.linuxfoundation.org (Postfix) with ESMTP id 215D1C0035\n for <ovs-dev@openvswitch.org>; Wed, 18 Feb 2026 10:02:15 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id 3A74A607C9\n for <ovs-dev@openvswitch.org>; Wed, 18 Feb 2026 10:02:11 +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 rvhBAEHfPcMg for <ovs-dev@openvswitch.org>;\n Wed, 18 Feb 2026 10:02:10 +0000 (UTC)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by smtp3.osuosl.org (Postfix) with ESMTPS id DA696607CC\n for <ovs-dev@openvswitch.org>; Wed, 18 Feb 2026 10:02:09 +0000 (UTC)","from mail-wm1-f71.google.com (mail-wm1-f71.google.com\n [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-59-KO-Pz7K6PpyF97JYIv7Z4Q-1; Wed, 18 Feb 2026 05:02:07 -0500","by mail-wm1-f71.google.com with SMTP id\n 5b1f17b1804b1-4836b7fbf4fso41336275e9.2\n for <ovs-dev@openvswitch.org>; Wed, 18 Feb 2026 02:02:07 -0800 (PST)","from localhost (net-37-119-153-93.cust.vodafonedsl.it.\n [37.119.153.93]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-4834d482480sm612804505e9.0.2026.02.18.02.02.03\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 18 Feb 2026 02:02:03 -0800 (PST)"],"X-Virus-Scanned":["amavis at osuosl.org","amavis at osuosl.org"],"X-Comment":"SPF check N/A for local connections -\n client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN> ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1D78B40776","OpenDKIM Filter v2.11.0 smtp3.osuosl.org DA696607CC"],"Received-SPF":"Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124;\n helo=us-smtp-delivery-124.mimecast.com;\n envelope-from=lorenzo.bianconi@redhat.com; receiver=<UNKNOWN>","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp3.osuosl.org DA696607CC","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771408928;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=i2EaRTE0qtrUlX+frjlhCJrtUCCtq1VM9/wL0FWYkDM=;\n b=b4fcclKLYkNLBHurA1TiP17/pmym5jVW/vHXCKvYL+0+OXpUO6o06vyD7jKKJWuEau90WR\n 7mV6t8pTMQ1aL8hD9KI1MBOnnesvCPaK246QEtxQQpg4sTSkgCKb3CbAqybYajHsiUOvJm\n aRKsiKkZr95BHmzOUDRk7O5tWova4hM=","X-MC-Unique":"KO-Pz7K6PpyF97JYIv7Z4Q-1","X-Mimecast-MFC-AGG-ID":"KO-Pz7K6PpyF97JYIv7Z4Q_1771408926","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1771408925; x=1772013725;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=i2EaRTE0qtrUlX+frjlhCJrtUCCtq1VM9/wL0FWYkDM=;\n b=enoczSCE1GkRGM1ARwn8XM39CqkRNXPr+OBRu3Zv2ZGsh7kMcoQxVchoOxgbXPdhcB\n +jlk3PkEIzfcak+SgtbbXZQM7naJjaPARr9LZpG4diCjpA7N2Y0p3Owli74UctBwVTIC\n 5tPIUZJbDst6xuMUPo+Eur4PbUr2Ns29WsmWQbP5pyQDKWDFiMMjqyjTV/QLuXCuWfCf\n nTqjtFBASFUgSh+1+QfMouPehOWMHa3aLRjxlFxBQK44TVdHNgwTTL2pvUEWLfBf7wDM\n rxi3jC2bbZHQO7iXhcaoDpfAC+GOOskfkqGUxEEej5Ktb4PR0idWubLcjlzBN/9zOp0B\n yBjg==","X-Gm-Message-State":"AOJu0YzKANJJCTg+61iYg1JM0LD+TlNgNuz6Uz6Xa5I3Ot+p6rizeUI0\n 0Zt50unVRKfqFNnS462rB3YWojUqDMrPCWH389VXngoNOPq2AG+yhaOmDh7NQRY7tSAEyYyxz8+\n 77EP6QhZq0n6Oq7ZAXgGOfkmrZXEWMeYliQdv7QAkAss41X/QMzt6rDvxr2DoGdK++4dW1hiA+T\n j+TobUxXXoWo56B61M/h8b3AXY1QJF1j85mbZ+Z09Tw5R+T/2i4Kv1hA==","X-Gm-Gg":"AZuq6aK3dTyBkyBq++ewUZZYYi17y4q4DuUP7NodwsADYYxcIIQp6M2JXEmcmh0iRDG\n vV2zzZsYIy2vzGaqdt+RGt4cvMj9ZsHxsfb3rhn++OLUszqSG2APHUBjJXqjD/Z0C+BpPtruRXw\n VrhIl0Jv3OWWWWhW8yEcGNJ8D7KdKNU/iKXiUKyksFg/gq+xKuHK69DRO5CrKrodZj3llg5ehW4\n 98U7C2+FI9aIwnHor3ysWUw2WNTntWDPbmYmpyba4YhV6mjTfhkUEgskRpPE2//a5+2doat1A5d\n LlbZyUYgj8fmGMS4aMoJOy7EU0+VTjfE6cGwLAHqBcNxG8bqX5bBUbPtb8XiMPHfMUGbGzjf0Fe\n DupUddC57KMk7O7kd/zNQe5h1MR1IZXJ/aHmwjVc8Pay/hDlPBRbgIpS59QTeYuXXnIJDUg==","X-Received":["by 2002:a05:600c:8715:b0:483:a21:774c with SMTP id\n 5b1f17b1804b1-48398ae8e36mr21648735e9.25.1771408925323;\n Wed, 18 Feb 2026 02:02:05 -0800 (PST)","by 2002:a05:600c:8715:b0:483:a21:774c with SMTP id\n 5b1f17b1804b1-48398ae8e36mr21648065e9.25.1771408924610;\n Wed, 18 Feb 2026 02:02:04 -0800 (PST)"],"To":"ovs-dev@openvswitch.org","Date":"Wed, 18 Feb 2026 11:01:42 +0100","Message-ID":"\n <e493c793c362f80971a523cf5a47d064dba7e3b8.1771408243.git.lorenzo.bianconi@redhat.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<cover.1771408243.git.lorenzo.bianconi@redhat.com>","References":"<cover.1771408243.git.lorenzo.bianconi@redhat.com>","MIME-Version":"1.0","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"vpKvTsC-WV_wSVXtHrgOskAvjMEWzZNJyjX-1DUuJOk_1771408926","X-Mimecast-Originator":"redhat.com","Subject":"[ovs-dev] [PATCH ovn v3 2/2] northd: Add lflow-ip for\n logical_switch creation/deletion.","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":"Lorenzo Bianconi via dev <ovs-dev@openvswitch.org>","Reply-To":"Lorenzo Bianconi <lorenzo.bianconi@redhat.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":"Introduce logical-flows incremental processing support for\nlogical_switch creation/deletion.\n\nReported-at: https://issues.redhat.com/browse/FDP-759\nSigned-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>\n---\n northd/en-lflow.c     | 10 +++--\n northd/en-multicast.c |  3 +-\n northd/lflow-mgr.c    |  4 ++\n northd/northd.c       | 97 +++++++++++++++++++++++++++++++++++--------\n northd/northd.h       |  7 +++-\n tests/ovn-northd.at   | 11 +++--\n 6 files changed, 105 insertions(+), 27 deletions(-)","diff":"diff --git a/northd/en-lflow.c b/northd/en-lflow.c\nindex cc525c806..15431262a 100644\n--- a/northd/en-lflow.c\n+++ b/northd/en-lflow.c\n@@ -148,9 +148,6 @@ lflow_northd_handler(struct engine_node *node,\n         return EN_UNHANDLED;\n     }\n \n-    if (northd_has_lswitches_in_tracked_data(&northd_data->trk_data)) {\n-        return EN_UNHANDLED;\n-    }\n \n     const struct engine_context *eng_ctx = engine_get_context();\n     struct lflow_data *lflow_data = data;\n@@ -165,6 +162,13 @@ lflow_northd_handler(struct engine_node *node,\n         return EN_UNHANDLED;\n     }\n \n+    if (!lflow_handle_northd_ls_changes(eng_ctx->ovnsb_idl_txn,\n+                                        &northd_data->trk_data.trk_switches,\n+                                        &lflow_input,\n+                                        lflow_data->lflow_table)) {\n+        return EN_UNHANDLED;\n+    }\n+\n     if (!lflow_handle_northd_port_changes(eng_ctx->ovnsb_idl_txn,\n                                           &northd_data->trk_data.trk_lsps,\n                                           &lflow_input,\ndiff --git a/northd/en-multicast.c b/northd/en-multicast.c\nindex a7dfd71c4..97b12f6a3 100644\n--- a/northd/en-multicast.c\n+++ b/northd/en-multicast.c\n@@ -153,7 +153,8 @@ multicast_igmp_northd_handler(struct engine_node *node, void *data OVS_UNUSED)\n         return EN_UNHANDLED;\n     }\n \n-    if (hmapx_count(&northd_data->trk_data.trk_switches.deleted)) {\n+    if (hmapx_count(&northd_data->trk_data.trk_switches.crupdated) ||\n+        hmapx_count(&northd_data->trk_data.trk_switches.deleted)) {\n         return EN_UNHANDLED;\n     }\n \ndiff --git a/northd/lflow-mgr.c b/northd/lflow-mgr.c\nindex bc02697b7..d5303a571 100644\n--- a/northd/lflow-mgr.c\n+++ b/northd/lflow-mgr.c\n@@ -772,6 +772,10 @@ lflow_table_add_lflow__(struct lflow_table *lflow_table,\n             hmap_insert(&lflow_ref->lflow_ref_nodes, &lrn->ref_node, hash);\n         }\n \n+        if (lrn->dpgrp_lflow) {\n+            dynamic_bitmap_realloc(&lrn->dpgrp_bitmap, dp_bitmap_len);\n+        }\n+\n         if (!lrn->linked) {\n             if (lrn->dpgrp_lflow) {\n                 ovs_assert(lrn->dpgrp_bitmap.capacity == dp_bitmap_len);\ndiff --git a/northd/northd.c b/northd/northd.c\nindex 8d034ee1d..ca8ca9fa2 100644\n--- a/northd/northd.c\n+++ b/northd/northd.c\n@@ -5848,10 +5848,13 @@ enum mirror_filter {\n \n static void\n build_mirror_default_lflow(struct ovn_datapath *od,\n-                           struct lflow_table *lflows)\n+                           struct lflow_table *lflows,\n+                           struct lflow_ref *lflow_ref)\n {\n-    ovn_lflow_add(lflows, od, S_SWITCH_IN_MIRROR, 0, \"1\", \"next;\", NULL);\n-    ovn_lflow_add(lflows, od, S_SWITCH_OUT_MIRROR, 0, \"1\", \"next;\", NULL);\n+    ovn_lflow_add(lflows, od, S_SWITCH_IN_MIRROR, 0, \"1\", \"next;\",\n+                  lflow_ref);\n+    ovn_lflow_add(lflows, od, S_SWITCH_OUT_MIRROR, 0, \"1\", \"next;\",\n+                  lflow_ref);\n }\n \n static void\n@@ -19074,29 +19077,36 @@ build_lswitch_and_lrouter_iterate_by_ls(struct ovn_datapath *od,\n                                         struct lswitch_flow_build_info *lsi)\n {\n     ovs_assert(od->nbs);\n-    build_mirror_default_lflow(od, lsi->lflows);\n+    build_mirror_default_lflow(od, lsi->lflows, od->datapath_lflows);\n     build_lswitch_lflows_pre_acl_and_acl(od, lsi->lflows,\n-                                         lsi->meter_groups, NULL);\n-    build_network_function(od, lsi->lflows, lsi->ls_port_groups, NULL);\n-    build_fwd_group_lflows(od, lsi->lflows, NULL);\n-    build_lswitch_lflows_admission_control(od, lsi->lflows, NULL);\n-    build_lswitch_learn_fdb_od(od, lsi->lflows, NULL);\n-    build_lswitch_arp_nd_responder_default(od, lsi->lflows, NULL);\n+                                         lsi->meter_groups,\n+                                         od->datapath_lflows);\n+    build_network_function(od, lsi->lflows, lsi->ls_port_groups,\n+                           od->datapath_lflows);\n+    build_fwd_group_lflows(od, lsi->lflows, od->datapath_lflows);\n+    build_lswitch_lflows_admission_control(od, lsi->lflows,\n+                                           od->datapath_lflows);\n+    build_lswitch_learn_fdb_od(od, lsi->lflows, od->datapath_lflows);\n+    build_lswitch_arp_nd_responder_default(od, lsi->lflows,\n+                                           od->datapath_lflows);\n     build_lswitch_dns_lookup_and_response(od, lsi->lflows, lsi->meter_groups,\n-                                          NULL);\n-    build_lswitch_dhcp_and_dns_defaults(od, lsi->lflows, NULL);\n+                                          od->datapath_lflows);\n+    build_lswitch_dhcp_and_dns_defaults(od, lsi->lflows, od->datapath_lflows);\n     build_lswitch_destination_lookup_bmcast(od, lsi->lflows, &lsi->actions,\n-                                            lsi->meter_groups, NULL);\n-    build_lswitch_output_port_sec_od(od, lsi->lflows, NULL);\n+                                            lsi->meter_groups,\n+                                            od->datapath_lflows);\n+    build_lswitch_output_port_sec_od(od, lsi->lflows, od->datapath_lflows);\n     /* CT extraction flows are built with stateful flows, but default rule is\n      * always needed */\n     ovn_lflow_add(lsi->lflows, od, S_SWITCH_IN_CT_EXTRACT, 0, \"1\", \"next;\",\n-                  NULL);\n-    build_lswitch_lb_affinity_default_flows(od, lsi->lflows, NULL);\n+                  od->datapath_lflows);\n+    build_lswitch_lb_affinity_default_flows(od, lsi->lflows,\n+                                            od->datapath_lflows);\n     if (od->has_evpn_vni) {\n-        build_lswitch_lflows_evpn_l2_unknown(od, lsi->lflows, NULL);\n+        build_lswitch_lflows_evpn_l2_unknown(od, lsi->lflows,\n+                                             od->datapath_lflows);\n     } else {\n-        build_lswitch_lflows_l2_unknown(od, lsi->lflows, NULL);\n+        build_lswitch_lflows_l2_unknown(od, lsi->lflows, od->datapath_lflows);\n     }\n     build_mcast_flood_lswitch(od, lsi->lflows, &lsi->actions, NULL);\n }\n@@ -19871,6 +19881,57 @@ lflow_handle_northd_lr_changes(struct ovsdb_idl_txn *ovnsb_txn,\n     return handled;\n }\n \n+bool\n+lflow_handle_northd_ls_changes(struct ovsdb_idl_txn *ovnsb_txn,\n+                               struct tracked_dps *tracked_ls,\n+                               struct lflow_input *lflow_input,\n+                               struct lflow_table *lflows)\n+{\n+    struct hmapx_node *hmapx_node;\n+    struct ovn_datapath *od;\n+\n+    HMAPX_FOR_EACH (hmapx_node, &tracked_ls->deleted) {\n+        od = hmapx_node->data;\n+        if (!lflow_ref_resync_flows(\n+                    od->datapath_lflows, lflows, ovnsb_txn, lflow_input->dps,\n+                    lflow_input->ovn_internal_version_changed,\n+                    lflow_input->sbrec_logical_flow_table,\n+                    lflow_input->sbrec_logical_dp_group_table)) {\n+            return false;\n+        }\n+    }\n+\n+    struct lswitch_flow_build_info lsi = {\n+        .meter_groups = lflow_input->meter_groups,\n+        .ls_port_groups = lflow_input->ls_port_groups,\n+        .lflows = lflows,\n+        .match = DS_EMPTY_INITIALIZER,\n+        .actions = DS_EMPTY_INITIALIZER,\n+    };\n+\n+    HMAPX_FOR_EACH (hmapx_node, &tracked_ls->crupdated) {\n+        od = hmapx_node->data;\n+        lflow_ref_unlink_lflows(od->datapath_lflows);\n+        build_lswitch_and_lrouter_iterate_by_ls(od, &lsi);\n+    }\n+\n+    ds_destroy(&lsi.actions);\n+    ds_destroy(&lsi.match);\n+\n+    HMAPX_FOR_EACH (hmapx_node, &tracked_ls->crupdated) {\n+        od = hmapx_node->data;\n+        if (!lflow_ref_sync_lflows(\n+                    od->datapath_lflows, lflows, ovnsb_txn, lflow_input->dps,\n+                    lflow_input->ovn_internal_version_changed,\n+                    lflow_input->sbrec_logical_flow_table,\n+                    lflow_input->sbrec_logical_dp_group_table)) {\n+            return false;\n+         }\n+    }\n+\n+    return true;\n+}\n+\n bool\n lflow_handle_northd_port_changes(struct ovsdb_idl_txn *ovnsb_txn,\n                                  struct tracked_ovn_ports *trk_lsps,\ndiff --git a/northd/northd.h b/northd/northd.h\nindex 8bfd9b804..5f21ec487 100644\n--- a/northd/northd.h\n+++ b/northd/northd.h\n@@ -482,8 +482,7 @@ struct ovn_datapath {\n     /* Map of ovn_port objects belonging to this datapath.\n      * This map doesn't include derived ports. */\n     struct hmap ports;\n-    /* Reference to the lflows belonging to this datapath currently router\n-     * only lflows. */\n+    /* Reference to the lflows belonging to this datapath. */\n     struct lflow_ref *datapath_lflows;\n };\n \n@@ -954,6 +953,10 @@ bool lflow_handle_northd_lr_changes(struct ovsdb_idl_txn *ovnsh_txn,\n                                      struct tracked_dps *,\n                                      struct lflow_input *,\n                                      struct lflow_table *lflows);\n+bool lflow_handle_northd_ls_changes(struct ovsdb_idl_txn *ovnsb_txn,\n+                                    struct tracked_dps *,\n+                                    struct lflow_input *,\n+                                    struct lflow_table *lflows);\n bool lflow_handle_northd_port_changes(struct ovsdb_idl_txn *ovnsb_txn,\n                                       struct tracked_ovn_ports *,\n                                       struct lflow_input *,\ndiff --git a/tests/ovn-northd.at b/tests/ovn-northd.at\nindex 81c36887e..cace07dfd 100644\n--- a/tests/ovn-northd.at\n+++ b/tests/ovn-northd.at\n@@ -2959,6 +2959,8 @@ OVN_FOR_EACH_NORTHD_NO_HV([\n AT_SETUP([check VXLAN mode disabling])\n ovn_start\n \n+OVS_CTL_TIMEOUT=120\n+\n # Create a fake chassis with vxlan encap to implicitly enable VXLAN mode.\n check_uuid ovn-sbctl \\\n     --id=@e create encap chassis_name=hv1 ip=\"192.168.0.1\" type=\"vxlan\" \\\n@@ -2994,6 +2996,8 @@ OVN_FOR_EACH_NORTHD_NO_HV([\n AT_SETUP([check datapath tunnel ids exhaustion])\n ovn_start\n \n+OVS_CTL_TIMEOUT=120\n+\n # Create a fake chassis with vxlan encap to lower MAX DP tunnel key to 2^12\n check_uuid ovn-sbctl \\\n     --id=@e create encap chassis_name=hv1 ip=\"192.168.0.1\" type=\"vxlan\" \\\n@@ -3148,11 +3152,12 @@ check_row_count sb:logical_dp_group 1\n echo \"$sw2_sb_uuid\" >> sw_sb_uuids\n \n AT_CHECK_UNQUOTED([ovn-sbctl --bare --columns _uuid,datapaths find Logical_DP_Group dnl\n-                    | grep -A1 $ls_dpg_uuid | tail -1 | tr ' ' '\\n' | sort], [0], [dnl\n+                    | tail -1 | tr ' ' '\\n' | sort], [0], [dnl\n $(cat sw_sb_uuids | sort)\n ])\n \n dnl Add two routers and check that they are in their new separate group.\n+ls_dpg_uuid=$(ovn-sbctl --bare --columns _uuid list Logical_DP_Group .)\n check ovn-nbctl --wait=sb lr-add lr0 -- lr-add lr1\n lr0_sb_uuid=$(fetch_column datapath_binding _uuid external_ids:name=lr0)\n lr1_sb_uuid=$(fetch_column datapath_binding _uuid external_ids:name=lr1)\n@@ -14958,7 +14963,7 @@ check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats\n check ovn-nbctl --wait=sb ls-add sw0\n check_engine_stats northd norecompute compute\n check_engine_stats ls_stateful norecompute compute\n-check_engine_stats lflow recompute nocompute\n+check_engine_stats lflow norecompute compute\n \n # For the below engine nodes, en_northd is input.  So check\n # their engine status.\n@@ -14996,7 +15001,7 @@ check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats\n check ovn-nbctl --wait=sb ls-del sw0\n check_engine_stats northd norecompute compute\n check_engine_stats ls_stateful norecompute compute\n-check_engine_stats lflow recompute nocompute\n+check_engine_stats lflow norecompute compute\n \n # For the below engine nodes, en_northd is input.  So check\n # their engine status.\n","prefixes":["ovs-dev","v3","2/2"]}