Skip to content
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

staticd: Fix SRv6 SID installation and deletion #18064

Merged
merged 3 commits into from
Feb 13, 2025
Merged

staticd: Fix SRv6 SID installation and deletion #18064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1654ba
staticd: Fix SRv6 SID installation and deletion
cscarpitta Feb 7, 2025
312f7b3
lib: Add sidStructure in SRv6 SIDs JSON output
cscarpitta Feb 8, 2025
a6d02fe
tests: Extend SRv6 static SIDs topotest to verify SID structure
cscarpitta Feb 8, 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
5 changes: 5 additions & 0 deletions lib/nexthop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,6 +1153,7 @@ void nexthop_json_helper(json_object *json_nexthop,
json_object *json_backups = NULL;
json_object *json_seg6local = NULL;
json_object *json_seg6local_context = NULL;
json_object *json_srv6_sid_structure = NULL;
json_object *json_seg6 = NULL;
json_object *json_segs = NULL;
int i;
Expand Down Expand Up @@ -1328,6 +1329,10 @@ void nexthop_json_helper(json_object *json_nexthop,
json_object_object_add(json_nexthop, "seg6localContext",
json_seg6local_context);

json_srv6_sid_structure = json_object_new_object();
srv6_sid_structure2json(&nexthop->nh_srv6->seg6local_ctx, json_srv6_sid_structure);
json_object_object_add(json_seg6local, "sidStructure", json_srv6_sid_structure);

if (nexthop->nh_srv6->seg6_segs &&
nexthop->nh_srv6->seg6_segs->num_segs == 1) {
json_seg6 = json_object_new_object();
Expand Down
8 changes: 8 additions & 0 deletions lib/srv6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ int snprintf_seg6_segs(char *str,
return strlen(str);
}

void srv6_sid_structure2json(const struct seg6local_context *ctx, json_object *json)
{
json_object_int_add(json, "blockLen", ctx->block_len);
json_object_int_add(json, "nodeLen", ctx->node_len);
json_object_int_add(json, "funcLen", ctx->function_len);
json_object_int_add(json, "argLen", ctx->argument_len);
}

void seg6local_context2json(const struct seg6local_context *ctx,
uint32_t action, json_object *json)
{
Expand Down
1 change: 1 addition & 0 deletions lib/srv6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ const char *seg6local_context2str(char *str, size_t size,
uint32_t action);
void seg6local_context2json(const struct seg6local_context *ctx,
uint32_t action, json_object *json);
void srv6_sid_structure2json(const struct seg6local_context *ctx, json_object *json);

static inline const char *srv6_sid_ctx2str(char *str, size_t size,
const struct srv6_sid_ctx *ctx)
Expand Down
62 changes: 54 additions & 8 deletions staticd/static_zebra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,9 @@ void static_zebra_srv6_sid_install(struct static_srv6_sid *sid)
struct seg6local_context ctx = {};
struct interface *ifp = NULL;
struct vrf *vrf;
struct prefix_ipv6 sid_block = {};
struct prefix_ipv6 locator_block = {};
struct prefix_ipv6 sid_locator = {};

if (!sid)
return;
Expand Down Expand Up @@ -696,10 +699,30 @@ void static_zebra_srv6_sid_install(struct static_srv6_sid *sid)
break;
}

ctx.block_len = sid->locator->block_bits_length;
ctx.node_len = sid->locator->node_bits_length;
ctx.function_len = sid->locator->function_bits_length;
ctx.argument_len = sid->locator->argument_bits_length;
sid_block = sid->addr;
sid_block.prefixlen = sid->locator->block_bits_length;
apply_mask(&sid_block);

locator_block = sid->locator->prefix;
locator_block.prefixlen = sid->locator->block_bits_length;
apply_mask(&locator_block);

if (prefix_same(&sid_block, &locator_block))
ctx.block_len = sid->locator->block_bits_length;
else {
zlog_warn("SID block %pFX does not match locator block %pFX", &sid_block,
&locator_block);
return;
}

sid_locator = sid->addr;
sid_locator.prefixlen = sid->locator->block_bits_length + sid->locator->node_bits_length;
apply_mask(&sid_locator);

if (prefix_same(&sid_locator, &sid->locator->prefix))
ctx.node_len = sid->locator->node_bits_length;

ctx.function_len = sid->addr.prefixlen - (ctx.block_len + ctx.node_len);

/* Attach the SID to the SRv6 interface */
if (!ifp) {
Expand All @@ -724,6 +747,9 @@ void static_zebra_srv6_sid_uninstall(struct static_srv6_sid *sid)
struct interface *ifp = NULL;
struct seg6local_context ctx = {};
struct vrf *vrf;
struct prefix_ipv6 sid_block = {};
struct prefix_ipv6 locator_block = {};
struct prefix_ipv6 sid_locator = {};

if (!sid)
return;
Expand Down Expand Up @@ -803,10 +829,30 @@ void static_zebra_srv6_sid_uninstall(struct static_srv6_sid *sid)
}
}

ctx.block_len = sid->locator->block_bits_length;
ctx.node_len = sid->locator->node_bits_length;
ctx.function_len = sid->locator->function_bits_length;
ctx.argument_len = sid->locator->argument_bits_length;
sid_block = sid->addr;
sid_block.prefixlen = sid->locator->block_bits_length;
apply_mask(&sid_block);

locator_block = sid->locator->prefix;
locator_block.prefixlen = sid->locator->block_bits_length;
apply_mask(&locator_block);

if (prefix_same(&sid_block, &locator_block))
ctx.block_len = sid->locator->block_bits_length;
else {
zlog_warn("SID block %pFX does not match locator block %pFX", &sid_block,
&locator_block);
return;
}

sid_locator = sid->addr;
sid_locator.prefixlen = sid->locator->block_bits_length + sid->locator->node_bits_length;
apply_mask(&sid_locator);

if (prefix_same(&sid_locator, &sid->locator->prefix))
ctx.node_len = sid->locator->node_bits_length;

ctx.function_len = sid->addr.prefixlen - (ctx.block_len + ctx.node_len);

static_zebra_send_localsid(ZEBRA_ROUTE_DELETE, &sid->addr.prefix, sid->addr.prefixlen,
ifp->ifindex, action, &ctx);
Expand Down
32 changes: 28 additions & 4 deletions tests/topotests/static_srv6_sids/expected_srv6_sids.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End"
"action": "End",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 0,
"argLen": 0
}
},
"seg6localContext": {

Expand Down Expand Up @@ -60,7 +66,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End.DT4"
"action": "End.DT4",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 16,
"argLen": 0
}
},
"seg6localContext": {
"table": 10
Expand Down Expand Up @@ -95,7 +107,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End.DT6"
"action": "End.DT6",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 16,
"argLen": 0
}
},
"seg6localContext": {
"table": 20
Expand Down Expand Up @@ -130,7 +148,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End.DT46"
"action": "End.DT46",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 16,
"argLen": 0
}
},
"seg6localContext": {
"table": 30
Expand Down
24 changes: 21 additions & 3 deletions tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End.DT4"
"action": "End.DT4",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 16,
"argLen": 0
}
},
"seg6localContext": {
"table": 10
Expand Down Expand Up @@ -60,7 +66,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End.DT6"
"action": "End.DT6",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 16,
"argLen": 0
}
},
"seg6localContext": {
"table": 20
Expand Down Expand Up @@ -95,7 +107,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End.DT46"
"action": "End.DT46",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 16,
"argLen": 0
}
},
"seg6localContext": {
"table": 30
Expand Down
16 changes: 14 additions & 2 deletions tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End.DT4"
"action": "End.DT4",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 16,
"argLen": 0
}
},
"seg6localContext": {
"table": 10
Expand Down Expand Up @@ -60,7 +66,13 @@
"active": true,
"weight": 1,
"seg6local": {
"action": "End.DT46"
"action": "End.DT46",
"sidStructure": {
"blockLen": 32,
"nodeLen": 16,
"funcLen": 16,
"argLen": 0
}
},
"seg6localContext": {
"table": 30
Expand Down
Loading