Hi Lorenzo, On 8/22/24 23:59, Lorenzo Bianconi wrote: > This reverts commit 090ca4ecaa9200850ae37c1c126a6ff85651d3f0. >
Please add some information about why this is reverted. I know you added it into the cover letter but that doesn't get committed. Please add a reference to our internal issue too: https://issues.redhat.com/browse/FDP-750 Otherwise, this looks good to me. Regards, Dumitru > Signed-off-by: Lorenzo Bianconi <[email protected]> > --- > controller/ofctrl.c | 54 ------------------------------------- > controller/ofctrl.h | 2 -- > controller/ovn-controller.c | 2 -- > tests/system-ovn.at | 8 ------ > 4 files changed, 66 deletions(-) > > diff --git a/controller/ofctrl.c b/controller/ofctrl.c > index e023cab9b..f9387d375 100644 > --- a/controller/ofctrl.c > +++ b/controller/ofctrl.c > @@ -45,7 +45,6 @@ > #include "ovn/actions.h" > #include "lib/extend-table.h" > #include "lib/lb.h" > -#include "lib/ovn-util.h" > #include "openvswitch/poll-loop.h" > #include "physical.h" > #include "openvswitch/rconn.h" > @@ -390,16 +389,9 @@ struct meter_band_entry { > > static struct shash meter_bands; > > -static unsigned long *ecmp_nexthop_ids; > - > static void ofctrl_meter_bands_destroy(void); > static void ofctrl_meter_bands_clear(void); > > -static void ecmp_nexthop_monitor_run( > - const struct sbrec_ecmp_nexthop_table *enh_table, > - struct ovs_list *msgs); > - > - > /* MFF_* field ID for our Geneve option. In S_TLV_TABLE_MOD_SENT, this is > * the option we requested (we don't know whether we obtained it yet). In > * S_CLEAR_FLOWS or S_UPDATE_FLOWS, this is really the option we have. */ > @@ -438,7 +430,6 @@ ofctrl_init(struct ovn_extend_table *group_table, > groups = group_table; > meters = meter_table; > shash_init(&meter_bands); > - ecmp_nexthop_ids = bitmap_allocate(ECMP_NEXTHOP_IDS_LEN); > } > > /* S_NEW, for a new connection. > @@ -886,7 +877,6 @@ ofctrl_destroy(void) > expr_symtab_destroy(&symtab); > shash_destroy(&symtab); > ofctrl_meter_bands_destroy(); > - bitmap_free(ecmp_nexthop_ids); > } > > uint64_t > @@ -2316,47 +2306,6 @@ add_meter(struct ovn_extend_table_info *m_desired, > ofctrl_meter_bands_alloc(sb_meter, m_desired, msgs); > } > > -static void > -ecmp_nexthop_monitor_flush_ct_entry(uint64_t id, struct ovs_list *msgs) > -{ > - ovs_u128 mask = { > - /* ct_labels.label BITS[96-127] */ > - .u64.hi = 0xffffffff00000000, > - }; > - ovs_u128 nexthop = { > - .u64.hi = id << 32, > - }; > - struct ofp_ct_match match = { > - .labels = nexthop, > - .labels_mask = mask, > - }; > - struct ofpbuf *msg = ofp_ct_match_encode(&match, NULL, > - rconn_get_version(swconn)); > - ovs_list_push_back(msgs, &msg->list_node); > -} > - > -static void > -ecmp_nexthop_monitor_run(const struct sbrec_ecmp_nexthop_table *enh_table, > - struct ovs_list *msgs) > -{ > - unsigned long *ids = bitmap_allocate(ECMP_NEXTHOP_IDS_LEN); > - > - const struct sbrec_ecmp_nexthop *sbrec_ecmp_nexthop; > - SBREC_ECMP_NEXTHOP_TABLE_FOR_EACH (sbrec_ecmp_nexthop, enh_table) { > - bitmap_set1(ids, sbrec_ecmp_nexthop->id); > - } > - > - int id; > - BITMAP_FOR_EACH_1 (id, ECMP_NEXTHOP_IDS_LEN, ecmp_nexthop_ids) { > - if (!bitmap_is_set(ids, id)) { > - ecmp_nexthop_monitor_flush_ct_entry(id, msgs); > - } > - } > - > - bitmap_free(ecmp_nexthop_ids); > - ecmp_nexthop_ids = ids; > -} > - > static void > installed_flow_add(struct ovn_flow *d, > struct ofputil_bundle_ctrl_msg *bc, > @@ -2715,7 +2664,6 @@ ofctrl_put(struct ovn_desired_flow_table *lflow_table, > struct shash *pending_ct_zones, > struct hmap *pending_lb_tuples, > struct ovsdb_idl_index *sbrec_meter_by_name, > - const struct sbrec_ecmp_nexthop_table *enh_table, > uint64_t req_cfg, > bool lflows_changed, > bool pflows_changed) > @@ -2756,8 +2704,6 @@ ofctrl_put(struct ovn_desired_flow_table *lflow_table, > /* OpenFlow messages to send to the switch to bring it up-to-date. */ > struct ovs_list msgs = OVS_LIST_INITIALIZER(&msgs); > > - ecmp_nexthop_monitor_run(enh_table, &msgs); > - > /* Iterate through ct zones that need to be flushed. */ > struct shash_node *iter; > SHASH_FOR_EACH(iter, pending_ct_zones) { > diff --git a/controller/ofctrl.h b/controller/ofctrl.h > index 33953a8a4..129e3b6ad 100644 > --- a/controller/ofctrl.h > +++ b/controller/ofctrl.h > @@ -31,7 +31,6 @@ struct ofpbuf; > struct ovsrec_bridge; > struct ovsrec_open_vswitch_table; > struct sbrec_meter_table; > -struct sbrec_ecmp_nexthop_table; > struct shash; > > struct ovn_desired_flow_table { > @@ -60,7 +59,6 @@ void ofctrl_put(struct ovn_desired_flow_table *lflow_table, > struct shash *pending_ct_zones, > struct hmap *pending_lb_tuples, > struct ovsdb_idl_index *sbrec_meter_by_name, > - const struct sbrec_ecmp_nexthop_table *enh_table, > uint64_t nb_cfg, > bool lflow_changed, > bool pflow_changed); > diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c > index 854d80bdf..c48667887 100644 > --- a/controller/ovn-controller.c > +++ b/controller/ovn-controller.c > @@ -5722,8 +5722,6 @@ main(int argc, char *argv[]) > &ct_zones_data->ctx.pending, > &lb_data->removed_tuples, > sbrec_meter_by_name, > - sbrec_ecmp_nexthop_table_get( > - ovnsb_idl_loop.idl), > ofctrl_seqno_get_req_cfg(), > engine_node_changed(&en_lflow_output), > engine_node_changed(&en_pflow_output)); > diff --git a/tests/system-ovn.at b/tests/system-ovn.at > index 6e4ec4247..c2e35a74c 100644 > --- a/tests/system-ovn.at > +++ b/tests/system-ovn.at > @@ -6248,10 +6248,6 @@ sed -e 's/labels=0x[[0-9]]/labels=0x?/' | sort], [0], > [dnl > > tcp,orig=(src=172.16.0.1,dst=10.0.0.2,sport=<cleared>,dport=<cleared>),reply=(src=10.0.0.2,dst=172.16.0.1,sport=<cleared>,dport=<cleared>),zone=<cleared>,mark=<cleared>,labels=0x?000000000401020500000000,protoinfo=(state=<cleared>) > ]) > > -# Flush connection tracking entries > -ovn-nbctl --wait=hv lr-route-del R1 > -AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(172.16.0.1)]) > - > OVS_APP_EXIT_AND_WAIT([ovn-controller]) > > as ovn-sb > @@ -6474,10 +6470,6 @@ sed -e 's/labels=0x[[0-9]]/labels=0x?/' | sort], [0], > [dnl > > tcp,orig=(src=fd07::1,dst=fd01::2,sport=<cleared>,dport=<cleared>),reply=(src=fd01::2,dst=fd07::1,sport=<cleared>,dport=<cleared>),zone=<cleared>,mark=<cleared>,labels=0x?000000001001020400000000,protoinfo=(state=<cleared>) > ]) > > -# Flush connection tracking entries > -check ovn-nbctl --wait=hv lr-route-del R1 > -AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fd01::2)]) > - > OVS_APP_EXIT_AND_WAIT([ovn-controller]) > > as ovn-sb _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
