On Mon, Mar 9, 2026 at 7:21 PM Mark Michelson <[email protected]> wrote:
> Acked-by: Mark Michelson <[email protected]> > > On Thu, Feb 26, 2026 at 3:10 PM Jacob Tanenbaum <[email protected]> > wrote: > > > > This reverts commit 75dd3b02f1afc3af5d3f99878f8399812f6c2669. > > > > Additionally this includes a few small rebased changes that are required > > to compile and run the tests successfully > > > > Reported-by: Mark Michelson <[email protected]> > > Reported-at: https://issues.redhat.com/browse/FDP-2747 > > Signed-off-by: Jacob Tanenbaum <[email protected]> > > > > diff --git a/northd/en-lflow.c b/northd/en-lflow.c > > index 704fae709..d4351edb9 100644 > > --- a/northd/en-lflow.c > > +++ b/northd/en-lflow.c > > @@ -153,16 +153,19 @@ lflow_northd_handler(struct engine_node *node, > > return EN_UNHANDLED; > > } > > > > - if (northd_has_lrouters_in_tracked_data(&northd_data->trk_data)) { > > - return EN_UNHANDLED; > > - } > > - > > const struct engine_context *eng_ctx = engine_get_context(); > > struct lflow_data *lflow_data = data; > > > > struct lflow_input lflow_input; > > lflow_get_input_data(node, &lflow_input); > > > > + if (!lflow_handle_northd_lr_changes(eng_ctx->ovnsb_idl_txn, > > + > &northd_data->trk_data.trk_routers, > > + &lflow_input, > > + lflow_data->lflow_table)) { > > + return EN_UNHANDLED; > > + } > > + > > if (!lflow_handle_northd_port_changes(eng_ctx->ovnsb_idl_txn, > > > &northd_data->trk_data.trk_lsps, > > &lflow_input, > > diff --git a/northd/northd.c b/northd/northd.c > > index 983975dac..2cafd3997 100644 > > --- a/northd/northd.c > > +++ b/northd/northd.c > > @@ -583,6 +583,7 @@ ovn_datapath_create(struct hmap *datapaths, const > struct uuid *key, > > od->is_distributed = false; > > od->tunnel_key = sdp->sb_dp->tunnel_key; > > init_mcast_info_for_datapath(od); > > + od->datapath_lflows = lflow_ref_create(); > > return od; > > } > > > > @@ -613,6 +614,7 @@ ovn_datapath_destroy(struct ovn_datapath *od) > > destroy_ports_for_datapath(od); > > hmapx_destroy(&od->phys_ports); > > sset_destroy(&od->router_ips); > > + lflow_ref_destroy(od->datapath_lflows); > > free(od); > > } > > } > > @@ -19939,6 +19941,7 @@ lflow_reset_northd_refs(struct lflow_input > *lflow_input) > > struct ls_stateful_record *ls_stateful_rec; > > struct ovn_lb_datapaths *lb_dps; > > struct ovn_port *op; > > + const struct ovn_datapath *od; > > > > LR_STATEFUL_TABLE_FOR_EACH (lr_stateful_rec, > > lflow_input->lr_stateful_table) { > > @@ -19963,6 +19966,72 @@ lflow_reset_northd_refs(struct lflow_input > *lflow_input) > > HMAP_FOR_EACH (lb_dps, hmap_node, lflow_input->lb_datapaths_map) { > > lflow_ref_clear(lb_dps->lflow_ref); > > } > > + > > + HMAP_FOR_EACH (od, key_node, &lflow_input->lr_datapaths->datapaths) > { > > + lflow_ref_clear(od->datapath_lflows); > > + } > > + > > + HMAP_FOR_EACH (od, key_node, &lflow_input->ls_datapaths->datapaths) > { > > + lflow_ref_clear(od->datapath_lflows); > > + } > > +} > > + > > +bool > > +lflow_handle_northd_lr_changes(struct ovsdb_idl_txn *ovnsb_txn, > > + struct tracked_dps *tracked_lrs, > > + struct lflow_input *lflow_input, > > + struct lflow_table *lflows) > > +{ > > + bool handled = true; > > + struct hmapx_node *hmapx_node; > > + HMAPX_FOR_EACH (hmapx_node, &tracked_lrs->deleted) { > > + struct ovn_datapath *od = hmapx_node->data; > > + handled = lflow_ref_resync_flows( > > + od->datapath_lflows, lflows, ovnsb_txn, lflow_input->dps, > > + lflow_input->ovn_internal_version_changed, > > + lflow_input->sbrec_logical_flow_table, > > + lflow_input->sbrec_logical_dp_group_table); > > + if (!handled) { > > + return handled; > > + } > > + } > > + > > + struct lswitch_flow_build_info lsi = { > > + .lr_datapaths = lflow_input->lr_datapaths, > > + .lr_stateful_table = lflow_input->lr_stateful_table, > > + .lflows =lflows, > > + .route_data = lflow_input->route_data, > > + .route_tables = lflow_input->route_tables, > > + .route_policies = lflow_input->route_policies, > > + .match = DS_EMPTY_INITIALIZER, > > + .actions = DS_EMPTY_INITIALIZER, > > + }; > > + HMAPX_FOR_EACH (hmapx_node, &tracked_lrs->crupdated) { > > + struct ovn_datapath *od = hmapx_node->data; > > + > > + lflow_ref_unlink_lflows(od->datapath_lflows); > > + build_lswitch_and_lrouter_iterate_by_lr(od, &lsi); > > + } > > + > > + /* We need to make sure that all datapath groups are allocated > before > > + * trying to sync logical flows. Otherwise, we would need to > recompute > > + * those datapath groups within those flows over and over again. */ > > + HMAPX_FOR_EACH (hmapx_node, &tracked_lrs->crupdated) { > > + struct ovn_datapath *od = hmapx_node->data; > > + > > + handled = lflow_ref_sync_lflows( > > + od->datapath_lflows, lflows, ovnsb_txn, lflow_input->dps, > > + lflow_input->ovn_internal_version_changed, > > + lflow_input->sbrec_logical_flow_table, > > + lflow_input->sbrec_logical_dp_group_table); > > + if (!handled) { > > + break; > > + } > > + } > > + > > + ds_destroy(&lsi.actions); > > + ds_destroy(&lsi.match); > > + return handled; > > } > > > > bool > > diff --git a/northd/northd.h b/northd/northd.h > > index 4dcd128cc..f482075bd 100644 > > --- a/northd/northd.h > > +++ b/northd/northd.h > > @@ -479,11 +479,8 @@ struct ovn_datapath { > > /* Map of ovn_port objects belonging to this datapath. > > * This map doesn't include derived ports. */ > > struct hmap ports; > > - > > - /* XXX Reference to the lflows belonging to this datapath currently > router > > - * only lflows. This is NULL for now just to not waste any space > > - * as it's not used by anything right now, but it wasn't worth > reverting > > - * all the related changes. */ > > + /* Reference to the lflows belonging to this datapath currently > router > > + * only lflows. */ > > struct lflow_ref *datapath_lflows; > > }; > > > > diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at > > index e29f6d7b5..e3e678480 100644 > > --- a/tests/ovn-northd.at > > +++ b/tests/ovn-northd.at > > @@ -12692,7 +12692,7 @@ check_engine_stats lr_nat norecompute compute > > check_engine_stats lr_stateful norecompute compute > > check_engine_stats sync_to_sb_pb norecompute compute > > check_engine_stats sync_to_sb_lb norecompute compute > > -check_engine_stats lflow recompute nocompute > > +check_engine_stats lflow norecompute compute > > CHECK_NO_CHANGE_AFTER_RECOMPUTE > > > > check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats > > @@ -12703,7 +12703,7 @@ check_engine_stats lr_nat norecompute compute > > check_engine_stats lr_stateful norecompute compute > > check_engine_stats sync_to_sb_pb norecompute compute > > check_engine_stats sync_to_sb_lb norecompute compute > > -check_engine_stats lflow recompute nocompute > > +check_engine_stats lflow norecompute compute > > CHECK_NO_CHANGE_AFTER_RECOMPUTE > > > > check ovn-nbctl --wait=sb lr-add lr0 > > -- > > 2.52.0 > > > > Thank you Jacob and Mark, applied to main. Regards, Ales _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
