mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 02:01:55 +00:00
Code Releases Activity

Refactoring of struct rt_pending_export

Browse Source 
Now it stores const rte * instead of struct rte_storage * to allow for
different storage backends.
This commit is contained in:
Maria Matejka 2024-02-07 17:30:43 +01:00 committed by Katerina Kubecova
parent c8fad656c2
commit 35fe916155
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nest/route.h
View File

@ -245,9 +245,9 @@ struct rte_storage {
}; };
#define RTE_COPY(r) ((r) ? (r)->rte : (rte) {}) #define RTE_COPY(r) ((r) ? (r)->rte : (rte) {})
#define RTE_COPY_VALID(r) (((r) && (rte_is_valid(&(r)->rte))) ? (r)->rte : (rte) {}) #define RTE_COPY_VALID(r) (((r) && (rte_is_valid((r)))) ? *(r) : (rte) {})
#define RTE_OR_NULL(r) ((r) ? &((r)->rte) : NULL) #define RTE_OR_NULL(r) ((r) ? &((r)->rte) : NULL)
#define RTE_VALID_OR_NULL(r) (((r) && (rte_is_valid(&(r)->rte))) ? &((r)->rte) : NULL) #define RTE_VALID_OR_NULL(r) (((r) && (rte_is_valid((r)))) ? (r) : NULL)
#define RTES_WRITE(r) (((r) != ((struct rte_storage *) 0)) ? ((struct rte *) &(r)->rte) : NULL) #define RTES_WRITE(r) (((r) != ((struct rte_storage *) 0)) ? ((struct rte *) &(r)->rte) : NULL)
@ -315,7 +315,7 @@ struct rt_import_hook {
struct rt_pending_export { struct rt_pending_export {
struct rt_pending_export * _Atomic next; /* Next export for the same destination */ struct rt_pending_export * _Atomic next; /* Next export for the same destination */
struct rte_storage *new, *new_best, *old, *old_best; const rte *new, *new_best, *old, *old_best;
u64 seq; /* Sequential ID (table-local) of the pending export */ u64 seq; /* Sequential ID (table-local) of the pending export */
}; };

76
nest/rt-table.c
View File

@ -787,7 +787,7 @@ channel_rpe_mark_seen(struct channel *c, struct rt_pending_export *rpe)
rpe_mark_seen(c->refeed_req.hook, rpe); rpe_mark_seen(c->refeed_req.hook, rpe);
if (rpe->old) if (rpe->old)
bmap_clear(&c->export_reject_map, rpe->old->rte.id); bmap_clear(&c->export_reject_map, rpe->old->id);
} }
void void
@ -847,10 +847,10 @@ done:
channel_rpe_mark_seen(c, rpe); channel_rpe_mark_seen(c, rpe);
if (rpe->old) if (rpe->old)
{ {
if (bmap_test(&c->export_map, rpe->old->rte.id)) if (bmap_test(&c->export_map, rpe->old->id))
{ {
ASSERT_DIE(old_best == NULL); ASSERT_DIE(old_best == NULL);
old_best = &rpe->old->rte; old_best = rpe->old;
} }
} }
if (rpe == last) if (rpe == last)
@ -966,10 +966,10 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n,
channel_rpe_mark_seen(c, rpe); channel_rpe_mark_seen(c, rpe);
if (rpe->old) if (rpe->old)
{ {
if (bmap_test(&c->export_map, rpe->old->rte.id)) if (bmap_test(&c->export_map, rpe->old->id))
{ {
ASSERT_DIE(old_best == NULL); ASSERT_DIE(old_best == NULL);
old_best = &rpe->old->rte; old_best = rpe->old;
} }
} }
if (rpe == last) if (rpe == last)
@ -988,7 +988,7 @@ rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_
{ {
struct channel *c = channel_from_export_request(req); struct channel *c = channel_from_export_request(req);
const rte *o = RTE_VALID_OR_NULL(first->old_best); const rte *o = RTE_VALID_OR_NULL(first->old_best);
struct rte_storage *new_best = first->new_best; const rte *new_best = first->new_best;
int refeeding = channel_net_is_refeeding(c, net); int refeeding = channel_net_is_refeeding(c, net);
@ -1029,7 +1029,7 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
} }
struct rte_src *src = n ? n->src : o->src; struct rte_src *src = n ? n->src : o->src;
struct rte_storage *new_latest = first->new; const rte *new_latest = first->new;
RPE_WALK(first, rpe, src) RPE_WALK(first, rpe, src)
{ {
@ -1092,7 +1092,7 @@ rpe_next(struct rt_pending_export *rpe, struct rte_src *src)
return next; return next;
while (rpe = next) while (rpe = next)
if (src == (rpe->new ? rpe->new->rte.src : rpe->old->rte.src)) if (src == (rpe->new ? rpe->new->src : rpe->old->src))
return rpe; return rpe;
else else
next = atomic_load_explicit(&rpe->next, memory_order_acquire); next = atomic_load_explicit(&rpe->next, memory_order_acquire);
@ -1109,7 +1109,7 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
if (bmap_test(&hook->seq_map, rpe->seq)) if (bmap_test(&hook->seq_map, rpe->seq))
goto ignore; /* Seen already */ goto ignore; /* Seen already */
const net_addr *n = rpe->new_best ? rpe->new_best->rte.net : rpe->old_best->rte.net; const net_addr *n = rpe->new_best ? rpe->new_best->net : rpe->old_best->net;
/* Check export eligibility of this net */ /* Check export eligibility of this net */
if (!rt_prefilter_net(&hook->req->prefilter, n)) if (!rt_prefilter_net(&hook->req->prefilter, n))
@ -1196,22 +1196,22 @@ ignore:
* done outside of scope of rte_announce(). * done outside of scope of rte_announce().
*/ */
static void static void
rte_announce(struct rtable_private *tab, const struct netindex *i, net *net, struct rte_storage *new, struct rte_storage *old, rte_announce(struct rtable_private *tab, const struct netindex *i, net *net, const rte *new, const rte *old,
struct rte_storage *new_best, struct rte_storage *old_best) const rte *new_best, const rte *old_best)
{ {
/* Update network count */ /* Update network count */
tab->net_count += (!!new_best - !!old_best); tab->net_count += (!!new_best - !!old_best);
int new_best_valid = rte_is_valid(RTE_OR_NULL(new_best)); int new_best_valid = rte_is_valid(new_best);
int old_best_valid = rte_is_valid(RTE_OR_NULL(old_best)); int old_best_valid = rte_is_valid(old_best);
if ((new == old) && (new_best == old_best)) if ((new == old) && (new_best == old_best))
return; return;
if (new_best_valid) if (new_best_valid)
new_best->rte.sender->stats.pref++; new_best->sender->stats.pref++;
if (old_best_valid) if (old_best_valid)
old_best->rte.sender->stats.pref--; old_best->sender->stats.pref--;
if (EMPTY_LIST(tab->exporter.e.hooks) && EMPTY_LIST(tab->exporter.pending)) if (EMPTY_LIST(tab->exporter.e.hooks) && EMPTY_LIST(tab->exporter.pending))
{ {
@ -1219,8 +1219,8 @@ rte_announce(struct rtable_private *tab, const struct netindex *i, net *net, str
if (!old) if (!old)
return; return;
hmap_clear(&tab->id_map, old->rte.id); hmap_clear(&tab->id_map, old->id);
rte_free(old, tab); rte_free(SKIP_BACK(struct rte_storage, rte, old), tab);
return; return;
} }
@ -1265,10 +1265,10 @@ rte_announce(struct rtable_private *tab, const struct netindex *i, net *net, str
"new_best=%p id %u, " "new_best=%p id %u, "
"old_best=%p id %u seq=%lu", "old_best=%p id %u seq=%lu",
i->addr, i->addr,
new, new ? new->rte.id : 0, new ? new->rte.sender->req->name : NULL, new, new ? new->id : 0, new ? new->sender->req->name : NULL,
old, old ? old->rte.id : 0, old ? old->rte.sender->req->name : NULL, old, old ? old->id : 0, old ? old->sender->req->name : NULL,
new_best, new_best ? new_best->rte.id : 0, new_best, new_best ? new_best->id : 0,
old_best, old_best ? old_best->rte.id : 0, old_best, old_best ? old_best->id : 0,
rpe->seq); rpe->seq);
ASSERT_DIE(atomic_fetch_add_explicit(&rpeb->end, 1, memory_order_release) == end); ASSERT_DIE(atomic_fetch_add_explicit(&rpeb->end, 1, memory_order_release) == end);
@ -1717,8 +1717,9 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, struct n
log(L_TRACE "%s > ignored %N %s->%s", req->name, i->addr, old ? "filtered" : "none", new ? "filtered" : "none"); log(L_TRACE "%s > ignored %N %s->%s", req->name, i->addr, old ? "filtered" : "none", new ? "filtered" : "none");
/* Propagate the route change */ /* Propagate the route change */
rte_announce(table, i, net, new_stored, old_stored, rte_announce(table, i, net,
net->routes, old_best_stored); RTE_OR_NULL(new_stored), RTE_OR_NULL(old_stored),
RTE_OR_NULL(net->routes), RTE_OR_NULL(old_best_stored));
return 1; return 1;
} }
@ -1905,7 +1906,7 @@ rt_examine(rtable *tp, net_addr *a, struct channel *c, const struct filter *filt
const struct netindex *i = net_find_index(t->netindex, a); const struct netindex *i = net_find_index(t->netindex, a);
net *n = i ? net_find(t, i) : NULL; net *n = i ? net_find(t, i) : NULL;
if (n) if (n)
rt = RTE_COPY_VALID(n->routes); rt = RTE_COPY_VALID(RTE_OR_NULL(n->routes));
} }
if (!rt.src) if (!rt.src)
@ -2587,7 +2588,7 @@ rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struc
/* This net may affect some flowspecs, check the actual change */ /* This net may affect some flowspecs, check the actual change */
const rte *o = RTE_VALID_OR_NULL(first->old_best); const rte *o = RTE_VALID_OR_NULL(first->old_best);
struct rte_storage *new_best = first->new_best; const rte *new_best = first->new_best;
RPE_WALK(first, rpe, NULL) RPE_WALK(first, rpe, NULL)
{ {
@ -3122,8 +3123,8 @@ rt_export_cleanup(struct rtable_private *tab)
ASSERT_DIE(first->new || first->old); ASSERT_DIE(first->new || first->old);
const net_addr *n = first->new ? const net_addr *n = first->new ?
first->new->rte.net : first->new->net :
first->old->rte.net; first->old->net;
struct netindex *i = NET_TO_INDEX(n); struct netindex *i = NET_TO_INDEX(n);
ASSERT_DIE(i->index < tab->routes_block_size); ASSERT_DIE(i->index < tab->routes_block_size);
net *net = &tab->routes[i->index]; net *net = &tab->routes[i->index];
@ -3142,9 +3143,9 @@ rt_export_cleanup(struct rtable_private *tab)
/* For now, the old route may be finally freed */ /* For now, the old route may be finally freed */
if (first->old) if (first->old)
{ {
rt_rte_trace_in(D_ROUTES, first->old->rte.sender->req, &first->old->rte, "freed"); rt_rte_trace_in(D_ROUTES, first->old->sender->req, first->old, "freed");
hmap_clear(&tab->id_map, first->old->rte.id); hmap_clear(&tab->id_map, first->old->id);
rte_free(first->old, tab); rte_free(SKIP_BACK(struct rte_storage, rte, first->old), tab);
} }
#ifdef LOCAL_DEBUG #ifdef LOCAL_DEBUG
@ -3572,7 +3573,7 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
net *nb = net_route(tip, &dst); net *nb = net_route(tip, &dst);
if (nb) if (nb)
{ {
rb = RTE_COPY_VALID(nb->routes); rb = RTE_COPY_VALID(RTE_OR_NULL(nb->routes));
rta_clone(rb.attrs); rta_clone(rb.attrs);
net_copy(&nau.n, nb->routes->rte.net); net_copy(&nau.n, nb->routes->rte.net);
rb.net = &nau.n; rb.net = &nau.n;
@ -3821,7 +3822,7 @@ rt_next_hop_update_net(struct rtable_private *tab, struct netindex *ni, net *n)
{ "autoupdated [+best]", "autoupdated [best]" } { "autoupdated [+best]", "autoupdated [best]" }
}; };
rt_rte_trace_in(D_ROUTES, updates[i].new.sender->req, &updates[i].new, best_indicator[nb][ob]); rt_rte_trace_in(D_ROUTES, updates[i].new.sender->req, &updates[i].new, best_indicator[nb][ob]);
rte_announce(tab, ni, n, updates[i].new_stored, updates[i].old, new, old_best); rte_announce(tab, ni, n, &updates[i].new_stored->rte, &updates[i].old->rte, &new->rte, &old_best->rte);
total++; total++;
} }
@ -4225,7 +4226,8 @@ rt_prepare_feed(struct rt_table_export_hook *c, net *n, rt_feed_block *b)
if (!b->pos) if (!b->pos)
b->rpe = tmp_alloc(sizeof(struct rt_pending_export) * bs); b->rpe = tmp_alloc(sizeof(struct rt_pending_export) * bs);
b->rpe[b->pos++] = (struct rt_pending_export) { .new = n->routes, .new_best = n->routes }; const rte *new = RTE_OR_NULL(n->routes);
b->rpe[b->pos++] = (struct rt_pending_export) { .new = new, .new_best = new, };
} }
} }
else else
@ -4258,7 +4260,7 @@ rt_process_feed(struct rt_table_export_hook *c, rt_feed_block *b)
} }
else else
for (uint p = 0; p < b->pos; p++) for (uint p = 0; p < b->pos; p++)
c->h.req->export_one(c->h.req, b->rpe[p].new->rte.net, &b->rpe[p]); c->h.req->export_one(c->h.req, b->rpe[p].new->net, &b->rpe[p]);
} }
/** /**
@ -4292,9 +4294,9 @@ rt_feed_by_fib(void *data)
else if (!n->first) else if (!n->first)
continue; continue;
else if (n->first->old) else if (n->first->old)
a = n->first->old->rte.net; a = n->first->old->net;
else else
a = n->first->new->rte.net; a = n->first->new->net;
if (rt_prefilter_net(&c->h.req->prefilter, a)) if (rt_prefilter_net(&c->h.req->prefilter, a))
{ {
@ -4563,7 +4565,7 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
{ {
/* This net may affect some hostentries, check the actual change */ /* This net may affect some hostentries, check the actual change */
const rte *o = RTE_VALID_OR_NULL(first->old_best); const rte *o = RTE_VALID_OR_NULL(first->old_best);
struct rte_storage *new_best = first->new_best; const rte *new_best = first->new_best;
RPE_WALK(first, rpe, NULL) RPE_WALK(first, rpe, NULL)
{ {

6
proto/bgp/attrs.c
View File

@ -1971,15 +1971,13 @@ bgp_out_table_feed(void *data)
ea_set_attr(&ea, EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, tmp_copy_adata(&nhad.ad))); ea_set_attr(&ea, EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, tmp_copy_adata(&nhad.ad)));
} }
struct rte_storage es = { struct rte es = {
.rte = {
.attrs = ea, .attrs = ea,
.net = n->net, .net = n->net,
.src = rt_find_source_global(n->path_id), .src = rt_find_source_global(n->path_id),
.sender = NULL, .sender = NULL,
.lastmod = n->lastmod, .lastmod = n->lastmod,
.flags = n->cur ? REF_PENDING : 0, .flags = n->cur ? REF_PENDING : 0,
},
}; };
struct rt_pending_export rpe = { struct rt_pending_export rpe = {
@ -1988,7 +1986,7 @@ bgp_out_table_feed(void *data)
if (hook->h.req->export_bulk) if (hook->h.req->export_bulk)
{ {
const rte *feed = &es.rte; const rte *feed = &es;
hook->h.req->export_bulk(hook->h.req, n->net, &rpe, &rpe, &feed, 1); hook->h.req->export_bulk(hook->h.req, n->net, &rpe, &rpe, &feed, 1);
} }
else if (hook->h.req->export_one) else if (hook->h.req->export_one)