mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00
Code Releases Activity

MPLS: Improve handling of static label allocations

Browse Source 
Use mpls_new_label() / mpls_free_label() also for static labels, to keep
track of allocated labels and to enforce label ranges.

Static label allocations always use static label range, regardless of
configured label range.
This commit is contained in:
Ondrej Zajicek 2023-09-23 17:55:01 +02:00
parent 81a20ca5d8
commit b6385decb3
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nest/mpls.c
View File

@ -78,8 +78,7 @@
* TODO: * TODO:
* - protocols should do route refresh instead of restart when reconfiguration * - protocols should do route refresh instead of restart when reconfiguration
* requires changing labels (e.g. different label range) * requires changing labels (e.g. different label range)
* - registering static allocations * - handle label allocation failures
* - checking range in static allocations
* - special handling of reserved labels * - special handling of reserved labels
*/ */
@ -481,12 +480,14 @@ mpls_free_handle(struct mpls_domain *m UNUSED, struct mpls_handle *h)
*/ */
uint uint
mpls_new_label(struct mpls_domain *m, struct mpls_handle *h) mpls_new_label(struct mpls_domain *m, struct mpls_handle *h, uint n)
{ {
struct mpls_range *r = h->range; struct mpls_range *r = h->range;
uint n = lmap_first_zero_in_range(&m->labels, r->lo, r->hi);
if (n >= r->hi) if (!n)
n = lmap_first_zero_in_range(&m->labels, r->lo, r->hi);
if ((n < r->lo) || (n >= r->hi) || lmap_test(&m->labels, n))
return 0; return 0;
m->label_count++; m->label_count++;
@ -583,8 +584,7 @@ mpls_channel_postconfig(struct channel_config *CC)
cf_error("MPLS domain not specified"); cf_error("MPLS domain not specified");
if (!cc->range) if (!cc->range)
cc->range = (cc->label_policy == MPLS_POLICY_STATIC) ? cc->range = cc->domain->dynamic_range;
cc->domain->static_range : cc->domain->dynamic_range;
if (cc->range->domain != cc->domain) if (cc->range->domain != cc->domain)
cf_error("MPLS label range from different MPLS domain"); cf_error("MPLS label range from different MPLS domain");
@ -684,11 +684,14 @@ mpls_fec_map_free(struct mpls_fec_map *m)
/* Free allocated labels */ /* Free allocated labels */
HASH_WALK(m->label_hash, next_l, fec) HASH_WALK(m->label_hash, next_l, fec)
{ {
if (fec->policy != MPLS_POLICY_STATIC) struct mpls_handle *h = (fec->policy != MPLS_POLICY_STATIC) ? m->handle : m->static_handle;
mpls_free_label(m->domain, m->handle, fec->label); mpls_free_label(m->domain, h, fec->label);
} }
HASH_WALK_END; HASH_WALK_END;
if (m->static_handle)
mpls_free_handle(m->domain, m->static_handle);
mpls_free_handle(m->domain, m->handle); mpls_free_handle(m->domain, m->handle);
mpls_unlock_domain(m->domain); mpls_unlock_domain(m->domain);
@ -717,13 +720,17 @@ struct mpls_fec *
mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label) mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label)
{ {
struct mpls_fec *fec = HASH_FIND(m->label_hash, LABEL, label); struct mpls_fec *fec = HASH_FIND(m->label_hash, LABEL, label);
/* FIXME: check if (fec->policy == MPLS_POLICY_STATIC) */
if (fec) if (fec)
return fec; return fec;
fec = sl_allocz(mpls_slab(m, 0)); fec = sl_allocz(mpls_slab(m, 0));
fec->label = label; if (!m->static_handle)
m->static_handle = mpls_new_handle(m->domain, m->domain->cf->static_range->range);
fec->label = mpls_new_label(m->domain, m->static_handle, label);
fec->policy = MPLS_POLICY_STATIC; fec->policy = MPLS_POLICY_STATIC;
DBG("New FEC lab %u\n", fec->label); DBG("New FEC lab %u\n", fec->label);
@ -751,7 +758,7 @@ mpls_get_fec_by_net(struct mpls_fec_map *m, const net_addr *net, u32 path_id)
fec->path_id = path_id; fec->path_id = path_id;
net_copy(fec->net, net); net_copy(fec->net, net);
fec->label = mpls_new_label(m->domain, m->handle); fec->label = mpls_new_label(m->domain, m->handle, 0);
fec->policy = MPLS_POLICY_PREFIX; fec->policy = MPLS_POLICY_PREFIX;
DBG("New FEC net %u\n", fec->label); DBG("New FEC net %u\n", fec->label);
@ -784,7 +791,7 @@ mpls_get_fec_by_rta(struct mpls_fec_map *m, const rta *src, u32 class_id)
fec->class_id = class_id; fec->class_id = class_id;
fec->rta = rta; fec->rta = rta;
fec->label = mpls_new_label(m->domain, m->handle); fec->label = mpls_new_label(m->domain, m->handle, 0);
fec->policy = MPLS_POLICY_AGGREGATE; fec->policy = MPLS_POLICY_AGGREGATE;
DBG("New FEC rta %u\n", fec->label); DBG("New FEC rta %u\n", fec->label);
@ -805,7 +812,7 @@ mpls_get_fec_for_vrf(struct mpls_fec_map *m)
fec = sl_allocz(mpls_slab(m, 0)); fec = sl_allocz(mpls_slab(m, 0));
fec->label = mpls_new_label(m->domain, m->handle); fec->label = mpls_new_label(m->domain, m->handle, 0);
fec->policy = MPLS_POLICY_VRF; fec->policy = MPLS_POLICY_VRF;
fec->iface = m->vrf_iface; fec->iface = m->vrf_iface;
@ -825,8 +832,8 @@ mpls_free_fec(struct mpls_fec_map *m, struct mpls_fec *fec)
DBG("Free FEC %u\n", fec->label); DBG("Free FEC %u\n", fec->label);
if (fec->policy != MPLS_POLICY_STATIC) struct mpls_handle *h = (fec->policy != MPLS_POLICY_STATIC) ? m->handle : m->static_handle;
mpls_free_label(m->domain, m->handle, fec->label); mpls_free_label(m->domain, h, fec->label);
HASH_REMOVE2(m->label_hash, LABEL, m->pool, fec); HASH_REMOVE2(m->label_hash, LABEL, m->pool, fec);

3
nest/mpls.h
View File

@ -91,7 +91,7 @@ void mpls_domain_postconfig(struct mpls_domain_config *cf);
struct mpls_range_config * mpls_range_config_new(struct mpls_domain_config *m, struct symbol *s); struct mpls_range_config * mpls_range_config_new(struct mpls_domain_config *m, struct symbol *s);
void mpls_preconfig(struct config *c); void mpls_preconfig(struct config *c);
void mpls_commit(struct config *new, struct config *old); void mpls_commit(struct config *new, struct config *old);
uint mpls_new_label(struct mpls_domain *m, struct mpls_handle *h); uint mpls_new_label(struct mpls_domain *m, struct mpls_handle *h, uint n);
void mpls_free_label(struct mpls_domain *m, struct mpls_handle *h, uint n); void mpls_free_label(struct mpls_domain *m, struct mpls_handle *h, uint n);
static inline struct mpls_domain_config *cf_default_mpls_domain(struct config *cfg) static inline struct mpls_domain_config *cf_default_mpls_domain(struct config *cfg)
@ -153,6 +153,7 @@ struct mpls_fec_map {
struct channel *channel; /* MPLS channel for FEC announcement */ struct channel *channel; /* MPLS channel for FEC announcement */
struct mpls_domain *domain; /* MPLS domain, keeping reference */ struct mpls_domain *domain; /* MPLS domain, keeping reference */
struct mpls_handle *handle; /* Handle for allocation of labels */ struct mpls_handle *handle; /* Handle for allocation of labels */
struct mpls_handle *static_handle; /* Handle for static label allocations, optional */
struct iface *vrf_iface; struct iface *vrf_iface;
u8 mpls_rts; /* Source value used for MPLS routes (RTS_*) */ u8 mpls_rts; /* Source value used for MPLS routes (RTS_*) */