Skip to content

Commit

Permalink
controller: Optimize adding 'dps' to the local datapaths.
Browse files Browse the repository at this point in the history 
Don't add 'true_provider_switch' datapaths to the local datapaths.

Signed-off-by: Numan Siddique <[email protected]>
  • Loading branch information
@numansiddique
numansiddique committed Feb 6, 2025
1 parent 68a0938 commit 1ccaf09
Show file tree
Hide file tree
Showing 9 changed files with 1,153 additions and 27 deletions.
188 changes: 170 additions & 18 deletions controller/binding.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,10 @@ static bool binding_lport_update_port_sec(
static bool ovs_iface_matches_lport_iface_id_ver(
const struct ovsrec_interface *,
const struct sbrec_port_binding *);
static bool local_datapath_is_relevant(
struct local_datapath *, const struct sbrec_port_binding *ignore_peer_port,
struct hmap *local_datapaths, const struct sbrec_chassis *,
struct ovsdb_idl_index *);

void
related_lports_init(struct related_lports *rp)
Expand Down Expand Up @@ -1062,6 +1066,13 @@ binding_dump_related_lports(struct related_lports *related_lports,
}
}

struct dp_binding {
struct hmap_node key_node;

uint32_t dp_key;
struct hmapx binding_lports;
};

void
binding_dump_local_bindings(struct local_binding_data *lbinding_data,
struct ds *out_data)
Expand Down Expand Up @@ -1130,6 +1141,18 @@ binding_dump_local_bindings(struct local_binding_data *lbinding_data,
free(nodes);
}

void
binding_dump_local_datapaths(struct hmap *local_datapaths,
struct ds *out_data)
{
ds_put_cstr(out_data, "Local datapaths:\n");
struct local_datapath *ld;
HMAP_FOR_EACH (ld, hmap_node, local_datapaths) {
ds_put_format(out_data, "Datapath: %s, type: %s\n",
smap_get(&ld->datapath->external_ids, "name"), ld->is_switch ? "switch" : "router");
}
}

void
set_pb_chassis_in_sbrec(const struct sbrec_port_binding *pb,
const struct sbrec_chassis *chassis_rec,
Expand Down Expand Up @@ -2232,6 +2255,9 @@ binding_run(struct binding_ctx_in *b_ctx_in, struct binding_ctx_out *b_ctx_out)
struct lport *lnet_lport = xmalloc(sizeof *lnet_lport);
lnet_lport->pb = pb;
ovs_list_push_back(&localnet_lports, &lnet_lport->list_node);
if (pb->chassis == b_ctx_in->chassis_rec) {
sbrec_port_binding_set_chassis(pb, NULL);
}
break;
}

Expand Down Expand Up @@ -2561,6 +2587,15 @@ consider_iface_release(const struct ovsrec_interface *iface_rec,
&lbinding->iface->header_.uuid);
}

if (ld && !local_datapath_is_relevant(
ld, NULL, b_ctx_out->local_datapaths,
b_ctx_in->chassis_rec, b_ctx_in->sbrec_port_binding_by_name)) {
local_datapath_remove_and_destroy(ld,
b_ctx_out->local_datapaths,
b_ctx_out->tracked_dp_bindings);
ld = NULL;
}

} else if (b_lport && b_lport->type == LP_LOCALPORT) {
/* lbinding is associated with a localport. Remove it from the
* related lports. */
Expand Down Expand Up @@ -2948,32 +2983,38 @@ handle_updated_vif_lport(const struct sbrec_port_binding *pb,
return true;
}

static void
static bool
consider_patch_port_for_local_datapaths(const struct sbrec_port_binding *pb,
const struct sbrec_port_binding *cr_pb,
struct binding_ctx_in *b_ctx_in,
struct binding_ctx_out *b_ctx_out)
{
struct local_datapath *ld =
get_local_datapath(b_ctx_out->local_datapaths,
pb->datapath->tunnel_key);
const struct sbrec_port_binding *peer;
struct local_datapath *peer_ld = NULL;
struct local_datapath *ld = NULL;

ld = get_local_datapath(b_ctx_out->local_datapaths,
pb->datapath->tunnel_key);
if (ld && ld->has_only_dgp_peer_ports) {
/* Nothing much to do. */
return true;
}

peer = lport_get_peer(pb, b_ctx_in->sbrec_port_binding_by_name);
if (peer) {
peer_ld = get_local_datapath(b_ctx_out->local_datapaths,
peer->datapath->tunnel_key);
}

if (!ld) {
/* If 'ld' for this lport is not present, then check if
* there is a peer for this lport. If peer is present
* and peer's datapath is already in the local datapaths,
* then add this lport's datapath to the local_datapaths.
* */
const struct sbrec_port_binding *peer;
struct local_datapath *peer_ld = NULL;
peer = lport_get_peer(pb, b_ctx_in->sbrec_port_binding_by_name);
if (peer) {
peer_ld =
get_local_datapath(b_ctx_out->local_datapaths,
peer->datapath->tunnel_key);
}
if (peer_ld && need_add_peer_to_local(
b_ctx_in->sbrec_port_binding_by_name, peer,
b_ctx_in->chassis_rec)) {
if (peer_ld && !peer_ld->has_only_dgp_peer_ports &&
need_add_peer_to_local(b_ctx_in->sbrec_port_binding_by_name, peer,
b_ctx_in->chassis_rec)) {
add_local_datapath(
b_ctx_in->sbrec_datapath_binding_by_key,
b_ctx_in->sbrec_port_binding_by_datapath,
Expand All @@ -2986,7 +3027,7 @@ consider_patch_port_for_local_datapaths(const struct sbrec_port_binding *pb,
/* Add the peer datapath to the local datapaths if it's
* not present yet.
*/
if (need_add_peer_to_local(
if (peer && need_add_peer_to_local(
b_ctx_in->sbrec_port_binding_by_name, pb,
b_ctx_in->chassis_rec)) {
add_local_datapath_peer_port(
Expand All @@ -2997,6 +3038,48 @@ consider_patch_port_for_local_datapaths(const struct sbrec_port_binding *pb,
ld, b_ctx_out->local_datapaths,
b_ctx_out->tracked_dp_bindings);
}

if (!peer) {
/* Remove 'pb' from the ld's peer ports as it has no peer. */
remove_local_datapath_peer_port(pb, ld, b_ctx_out->local_datapaths);
}

/* We can consider removing the 'ld' of the patch port 'pb' from the
* local datapaths, if all the below conditions are met
* - 'pb' doesn't have a peer or ld' is a router datapath
* - if 'pb' is a distributed gateway port (dgp), then
* its chassisredirect port's ha chassis group doesn't
* contain our 'chassis rec'
* - and finally 'ld' is not relevant any more. See
* local_datapath_is_relevant() for more details.
*
* Note: If 'ld' can be removed, then all its connected local datapaths
* can also be removed.
*
* For example, if we had sw1-port1 -> sw1 -> lr1 -> sw2 and if sw1-port1
* resides on this chassis, and if the link between sw1 and lr1 is broken,
* then we can remove lr1 and sw2 from the local_datapaths.
* */
bool consider_ld_for_removal = !peer || !ld->is_switch;
if (consider_ld_for_removal && cr_pb) {
consider_ld_for_removal = !ha_chassis_group_contains(
cr_pb->ha_chassis_group, b_ctx_in->chassis_rec);
}

if (consider_ld_for_removal) {
if (!local_datapath_is_relevant(
ld, NULL, b_ctx_out->local_datapaths,
b_ctx_in->chassis_rec,
b_ctx_in->sbrec_port_binding_by_name)) {
/* This 'ld' can be removed from the local datapaths as
* - its a router datapath and
* - it has no peers locally. */
local_datapath_remove_and_destroy(ld,
b_ctx_out->local_datapaths,
b_ctx_out->tracked_dp_bindings);
ld = NULL;
}
}
}

if (sbrec_port_binding_is_updated(pb, SBREC_PORT_BINDING_COL_TYPE) &&
Expand All @@ -3008,6 +3091,8 @@ consider_patch_port_for_local_datapaths(const struct sbrec_port_binding *pb,
b_ctx_out->tracked_dp_bindings,
b_ctx_out->if_mgr);
}

return true;
}

static bool
Expand Down Expand Up @@ -3065,7 +3150,7 @@ handle_updated_port(struct binding_ctx_in *b_ctx_in,

case LP_PATCH:
update_related_lport(pb, b_ctx_out);
consider_patch_port_for_local_datapaths(pb, b_ctx_in, b_ctx_out);
handled = consider_patch_port_for_local_datapaths(pb, NULL, b_ctx_in, b_ctx_out);
break;

case LP_VTEP:
Expand Down Expand Up @@ -3107,7 +3192,7 @@ handle_updated_port(struct binding_ctx_in *b_ctx_in,
distributed_port, pb->logical_port);
break;
}
consider_patch_port_for_local_datapaths(distributed_pb, b_ctx_in,
handled = consider_patch_port_for_local_datapaths(distributed_pb, pb, b_ctx_in,
b_ctx_out);
break;

Expand Down Expand Up @@ -3878,3 +3963,70 @@ binding_destroy(void)
shash_destroy_free_data(&_qos_ports);
sset_clear(&_postponed_ports);
}

static bool
is_patch_pb_chassis_relevant(
const struct sbrec_port_binding *pb,
const struct sbrec_chassis *chassis,
struct ovsdb_idl_index *sbrec_port_binding_by_name)
{
if (ha_chassis_group_contains(pb->ha_chassis_group, chassis)) {
return true;
}

const struct sbrec_port_binding *pb_crp =
lport_get_cr_port(sbrec_port_binding_by_name, pb);
if (pb_crp) {
return ha_chassis_group_contains(pb_crp->ha_chassis_group, chassis);
}

return false;
}

static bool
local_datapath_is_relevant(struct local_datapath *ld,
const struct sbrec_port_binding *ignore_peer_port,
struct hmap *local_datapaths,
const struct sbrec_chassis *chassis,
struct ovsdb_idl_index *sbrec_pb_by_name)
{
if (!sset_is_empty(&ld->claimed_lports) ||
!shash_is_empty(&ld->external_ports) ||
!shash_is_empty(&ld->multichassis_ports) ||
ld->vtep_port) {
return true;
}

bool relevant = false;

for (size_t i = 0; i < ld->n_peer_ports && !relevant; i++) {
const struct sbrec_port_binding *remote = ld->peer_ports[i].remote;
const struct sbrec_port_binding *local = ld->peer_ports[i].local;

if (local == ignore_peer_port) {
continue;
}

if (is_patch_pb_chassis_relevant(local, chassis,
sbrec_pb_by_name)) {
return true;
}

if (is_patch_pb_chassis_relevant(remote, chassis,
sbrec_pb_by_name)) {
return true;
}

struct local_datapath *peer_ld;
uint32_t remote_peer_ld_key;
remote_peer_ld_key = ld->peer_ports[i].remote->datapath->tunnel_key;
peer_ld = get_local_datapath(local_datapaths, remote_peer_ld_key);
if (peer_ld && !peer_ld->has_only_dgp_peer_ports) {
relevant = local_datapath_is_relevant(peer_ld, remote,
local_datapaths, chassis,
sbrec_pb_by_name);
}
}

return relevant;
}
2 changes: 2 additions & 0 deletions controller/binding.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ bool binding_handle_port_binding_changes(struct binding_ctx_in *,
void binding_tracked_dp_destroy(struct hmap *tracked_datapaths);

void binding_dump_local_bindings(struct local_binding_data *, struct ds *);
void binding_dump_local_datapaths(struct hmap *local_datapaths,
struct ds *out_data);

void binding_dump_related_lports(struct related_lports *related_lports,
struct ds *);
Expand Down
Loading

0 comments on commit 1ccaf09

Please sign in to comment.