Skip to content

Minor: fix bridge implementation #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2025
Merged

Minor: fix bridge implementation #110

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9328fbb
mctpd: update setup peer logic for bridged endpoints
faizana-nvidia Aug 26, 2025
291baca
mctpd: reset pool for invalid set endpoint id response
faizana-nvidia Aug 27, 2025
3e0e9c2
mctpd: fix route creation for bridged gatewayed endpoints
faizana-nvidia Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 39 additions & 17 deletions src/mctpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2087,7 +2087,12 @@ static int endpoint_assign_eid(struct ctx *ctx, sd_bus_error *berr,
sd_bus_error_setf(
berr, SD_BUS_ERROR_FAILED,
"Endpoint returned failure to Set Endpoint ID");

if (rc < 0) {
// we have not yet created the pool route, reset here so that
// remove_peer() does not attempt to remove it
peer->pool_size = 0;
peer->pool_start = 0;
remove_peer(peer);
return rc;
}
Expand Down Expand Up @@ -2835,8 +2840,8 @@ static int peer_route_update(struct peer *peer, uint16_t type)
gw_addr.net = peer->net;
gw_addr.eid = peer->eid;
rc = mctp_nl_route_del(peer->ctx->nl, peer->pool_start,
peer->pool_size - 1,
peer->phys.ifindex, &gw_addr);
peer->pool_size - 1, 0,
&gw_addr);
if (rc < 0)
warnx("failed to delete route for peer pool eids %d-%d %s",
peer->pool_start,
Expand All @@ -2855,14 +2860,21 @@ static int peer_route_update(struct peer *peer, uint16_t type)
* The peer's route has already been set up */
static int setup_added_peer(struct peer *peer)
{
struct net *n = lookup_net(peer->ctx, peer->net);
int rc;

if (!n) {
bug_warn("%s Bad net %u", __func__, peer->net);
return -EPROTO;
}
// Set minimum MTU by default for compatibility. Clients can increase
// this with .SetMTU as needed
peer->mtu = mctp_nl_min_mtu_byindex(peer->ctx->nl, peer->phys.ifindex);

// add route before querying
add_peer_route(peer);
// add route before querying for non-bridged endpoints.
// bridged endpoints will use the bridge's pool range route.
if (!is_eid_in_bridge_pool(n, peer->ctx, peer->eid))
add_peer_route(peer);

rc = query_peer_properties(peer);
if (rc < 0)
Expand Down Expand Up @@ -4695,12 +4707,35 @@ static int endpoint_allocate_eids(struct peer *peer)
warnx("Invalid pool start %d", peer->pool_start);
return -1;
}
/* Add gateway route for all bridge's downstream EIDs.
* After allocation, the endpoint may initiate communication
* immediately, so set up routes for downstream endpoints beforehand.
*/
struct mctp_fq_addr gw_addr = { 0 };
gw_addr.net = peer->net;
gw_addr.eid = peer->eid;
rc = mctp_nl_route_add(peer->ctx->nl, peer->pool_start,
peer->pool_size - 1, 0, &gw_addr, peer->mtu);
if (rc < 0 && rc != -EEXIST) {
warnx("Failed to add gateway route for EID %d: %s", gw_addr.eid,
strerror(-rc));
return rc;
}

rc = endpoint_send_allocate_endpoint_ids(
peer, peer->pool_start, peer->pool_size,
mctp_ctrl_cmd_allocate_eids_alloc_eids, &allocated_pool_size,
&allocated_pool_start);
if (rc) {
warnx("Failed to allocate downstream EIDs");
// delete prior set routes for downstream endpoints
rc = mctp_nl_route_del(peer->ctx->nl, peer->pool_start,
peer->pool_size - 1, 0, &gw_addr);
if (rc < 0)
warnx("failed to delete route for peer pool eids %d-%d %s",
peer->pool_start,
peer->pool_start + peer->pool_size - 1,
strerror(-rc));
//reset peer pool
peer->pool_size = 0;
peer->pool_start = 0;
Expand All @@ -4712,19 +4747,6 @@ static int endpoint_allocate_eids(struct peer *peer)
if (!peer->pool_size)
return 0;

// add gateway route for all bridge's downstream eids
struct mctp_fq_addr gw_addr = { 0 };
gw_addr.net = peer->net;
gw_addr.eid = peer->eid;
rc = mctp_nl_route_add(peer->ctx->nl, peer->pool_start,
peer->pool_size - 1, peer->phys.ifindex,
&gw_addr, peer->mtu);
if (rc < 0 && rc != -EEXIST) {
warnx("Failed to add gateway route for EID %d: %s", gw_addr.eid,
strerror(-rc));
return rc;
}

sd_bus_add_object_vtable(peer->ctx->bus, &peer->slot_bridge, peer->path,
CC_MCTP_DBUS_IFACE_BRIDGE, bus_endpoint_bridge,
peer);
Expand Down